pyrox.dev
Merge pull request #138916 from chvp/bump-gomuks
gomuks: 0.2.3 -> 0.2.4
authored by
Bobby Rong
and committed by
GitHub
88ad847e
cbdfc16b
+3
-3
pkgs/applications/networking/instant-messengers/gomuks/default.nix
+3
-3
pkgs/applications/networking/instant-messengers/gomuks/default.nix
···
13
13
14
14
buildGoModule rec {
15
15
pname = "gomuks";
16
-
version = "0.2.3";
16
+
version = "0.2.4";
17
17
18
18
src = fetchFromGitHub {
19
19
owner = "tulir";
20
20
repo = pname;
21
21
rev = "v${version}";
22
-
sha256 = "0g0aa6h6bm00mdgkb38wm66rcrhqfvs2xj9rl04bwprsa05q5lca";
22
+
sha256 = "bTOfnEmJHTuniewH//SugNNDuKIFMQb1Safs0UVKH1c=";
23
23
};
24
24
25
-
vendorSha256 = "14ya5advpv4q5il235h5dxy8c2ap2yzrvqs0sjqgw0v1vm6vpwdx";
25
+
vendorSha256 = "PuNROoxL7UmcuYDgfnsMUsGk9i1jnQyWtaUmT7vXdKE=";
26
26
27
27
doCheck = false;
28
28
+15
-13
pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch
+15
-13
pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch
···
1
-
diff --git a/lib/notification/notify_linux.go b/lib/notification/notify_linux.go
2
-
index f93a95f..da6a61d 100644
3
-
--- a/lib/notification/notify_linux.go
4
-
+++ b/lib/notification/notify_linux.go
5
-
@@ -32,7 +32,7 @@ func Send(title, text string, critical, sound bool) error {
6
-
if critical {
7
-
soundName = "complete"
8
-
}
9
-
- exec.Command("paplay", "/usr/share/sounds/freedesktop/stereo/"+soundName+".oga").Run()
10
-
+ exec.Command("paplay", "@soundTheme@/share/sounds/freedesktop/stereo/"+soundName+".oga").Run()
11
-
}
12
-
return exec.Command("notify-send", args...).Run()
13
-
}
1
+
diff --git a/lib/notification/notify_xdg.go b/lib/notification/notify_xdg.go
2
+
index 7f102b8..996c15f 100644
3
+
--- a/lib/notification/notify_xdg.go
4
+
+++ b/lib/notification/notify_xdg.go
5
+
@@ -26,8 +26,8 @@ import (
6
+
var notifySendPath string
7
+
var audioCommand string
8
+
var tryAudioCommands = []string{"ogg123", "paplay"}
9
+
-var soundNormal = "/usr/share/sounds/freedesktop/stereo/message-new-instant.oga"
10
+
-var soundCritical = "/usr/share/sounds/freedesktop/stereo/complete.oga"
11
+
+var soundNormal = "@soundTheme@/share/sounds/freedesktop/stereo/message-new-instant.oga"
12
+
+var soundCritical = "@soundTheme@/share/sounds/freedesktop/stereo/complete.oga"
13
+
14
+
func getSoundPath(env, defaultPath string) string {
15
+
if path, ok := os.LookupEnv(env); ok {