tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
yabridge: fix notifications by hardcoding dbus
Kira Bruneau
2 years ago
c8dd9fb0
f173d088
+16
2 changed files
expand all
collapse all
unified
split
pkgs
tools
audio
yabridge
default.nix
hardcode-dependencies.patch
+1
pkgs/tools/audio/yabridge/default.nix
···
98
98
# Hard code bitbridge & runtime dependencies
99
99
(substituteAll {
100
100
src = ./hardcode-dependencies.patch;
101
101
+
libdbus = dbus.lib;
101
102
libxcb32 = pkgsi686Linux.xorg.libxcb;
102
103
inherit wine;
103
104
})
+15
pkgs/tools/audio/yabridge/hardcode-dependencies.patch
···
11
11
endif
12
12
13
13
# These are all headers-only libraries, and thus won't require separate 32-bit
14
14
+
diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp
15
15
+
index 66e08527..685c54af 100644
16
16
+
--- a/src/common/notifications.cpp
17
17
+
+++ b/src/common/notifications.cpp
18
18
+
@@ -29,8 +29,8 @@
19
19
+
#include "process.h"
20
20
+
#include "utils.h"
21
21
+
22
22
+
-constexpr char libdbus_library_name[] = "libdbus-1.so.3";
23
23
+
-constexpr char libdbus_library_fallback_name[] = "libdbus-1.so";
24
24
+
+constexpr char libdbus_library_name[] = "@libdbus@/lib/libdbus-1.so.3";
25
25
+
+constexpr char libdbus_library_fallback_name[] = "@libdbus@/lib/libdbus-1.so";
26
26
+
27
27
+
std::atomic<void*> libdbus_handle = nullptr;
28
28
+
std::mutex libdbus_mutex;
14
29
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
15
30
index 82db99a5..491f005d 100644
16
31
--- a/src/plugin/utils.cpp