diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-09-24 19:22:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 19:22:50 +0800 |
| commit | 88ad847e375482e326c1cc340db30caba98ee11c (patch) | |
| tree | 8acf2beb6f6079916bf6aa7d5c1b6d62e604a479 | |
| parent | cbdfc16b984c5cc85909bbd0b70280fe53f086bb (diff) | |
| parent | 65be4ada23bfb63b75df0293c31f5c79f1b84ac7 (diff) | |
| download | nixpkgs-88ad847e375482e326c1cc340db30caba98ee11c.tar nixpkgs-88ad847e375482e326c1cc340db30caba98ee11c.tar.gz nixpkgs-88ad847e375482e326c1cc340db30caba98ee11c.tar.bz2 nixpkgs-88ad847e375482e326c1cc340db30caba98ee11c.tar.lz nixpkgs-88ad847e375482e326c1cc340db30caba98ee11c.tar.xz nixpkgs-88ad847e375482e326c1cc340db30caba98ee11c.tar.zst nixpkgs-88ad847e375482e326c1cc340db30caba98ee11c.zip | |
Merge pull request #138916 from chvp/bump-gomuks
gomuks: 0.2.3 -> 0.2.4
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/gomuks/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch | 28 |
2 files changed, 18 insertions, 16 deletions
diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 0fea57ea9cc..5f2a094ca36 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "gomuks"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v${version}"; - sha256 = "0g0aa6h6bm00mdgkb38wm66rcrhqfvs2xj9rl04bwprsa05q5lca"; + sha256 = "bTOfnEmJHTuniewH//SugNNDuKIFMQb1Safs0UVKH1c="; }; - vendorSha256 = "14ya5advpv4q5il235h5dxy8c2ap2yzrvqs0sjqgw0v1vm6vpwdx"; + vendorSha256 = "PuNROoxL7UmcuYDgfnsMUsGk9i1jnQyWtaUmT7vXdKE="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch b/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch index 0e0d4e28b0a..dd89c92fd3d 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch +++ b/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch @@ -1,13 +1,15 @@ -diff --git a/lib/notification/notify_linux.go b/lib/notification/notify_linux.go -index f93a95f..da6a61d 100644 ---- a/lib/notification/notify_linux.go -+++ b/lib/notification/notify_linux.go -@@ -32,7 +32,7 @@ func Send(title, text string, critical, sound bool) error { - if critical { - soundName = "complete" - } -- exec.Command("paplay", "/usr/share/sounds/freedesktop/stereo/"+soundName+".oga").Run() -+ exec.Command("paplay", "@soundTheme@/share/sounds/freedesktop/stereo/"+soundName+".oga").Run() - } - return exec.Command("notify-send", args...).Run() - } +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 { |