dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #201929 from chvp/bump-gomuks

Browse Source 
gomuks: 0.2.4 -> 0.3.0
This commit is contained in:
Guillaume Girol 2022-11-26 16:58:47 +00:00 committed by GitHub
commit 02bebd410a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/networking/instant-messengers/gomuks/default.nix
View File

@ -13,28 +13,22 @@
buildGoModule rec {
pname = "gomuks";
version = "0.2.4";
version = "0.3.0";
src = fetchFromGitHub {
owner = "tulir";
repo = pname;
rev = "v${version}";
sha256 = "bTOfnEmJHTuniewH//SugNNDuKIFMQb1Safs0UVKH1c=";
sha256 = "sha256-gLyjqmGZudj8PmsYUGXHOjetZzi6u5CFI7Y50y2XAzk=";
};
vendorSha256 = "PuNROoxL7UmcuYDgfnsMUsGk9i1jnQyWtaUmT7vXdKE=";
vendorSha256 = "sha256-FmQJG6hv0YPyHVjZ/DvkQExrGLc1hjoiPS59MnqG2gU=";
doCheck = false;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ olm ];
# Upstream issue: https://github.com/tulir/gomuks/issues/260
patches = lib.optional stdenv.isLinux (substituteAll {
src = ./hardcoded_path.patch;
soundTheme = sound-theme-freedesktop;
});
postInstall = ''
cp -r ${
makeDesktopItem {
@ -49,7 +43,9 @@ buildGoModule rec {
}/* $out/
substituteAllInPlace $out/share/applications/*
wrapProgram $out/bin/gomuks \
--prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}"
--prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}" \
--set-default GOMUKS_SOUND_NORMAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/message-new-instant.oga" \
--set-default GOMUKS_SOUND_CRITICAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/complete.oga"
'';
meta = with lib; {

15
pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch
View File

@ -1,15 +0,0 @@
diff --git a/lib/notification/notify_xdg.go b/lib/notification/notify_xdg.go
index 7f102b8..996c15f 100644
--- a/lib/notification/notify_xdg.go
+++ b/lib/notification/notify_xdg.go
@@ -26,8 +26,8 @@ import (
var notifySendPath string
var audioCommand string
var tryAudioCommands = []string{"ogg123", "paplay"}
-var soundNormal = "/usr/share/sounds/freedesktop/stereo/message-new-instant.oga"
-var soundCritical = "/usr/share/sounds/freedesktop/stereo/complete.oga"
+var soundNormal = "@soundTheme@/share/sounds/freedesktop/stereo/message-new-instant.oga"
+var soundCritical = "@soundTheme@/share/sounds/freedesktop/stereo/complete.oga"
func getSoundPath(env, defaultPath string) string {
if path, ok := os.LookupEnv(env); ok {