alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #138916 from chvp/bump-gomuks

Browse source 
gomuks: 0.2.3 -> 0.2.4
This commit is contained in:
Bobby Rong 2021-09-24 19:22:50 +08:00 committed by GitHub
parent cbdfc16b98 65be4ada23
commit 88ad847e37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/instant-messengers/gomuks/default.nix
View file

@ -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;

28
pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch
View file

@ -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 {