From c8dd9fb0317b0e4f1e55a22e625af59517ebfdf8 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Thu, 11 Apr 2024 18:14:55 -0400 Subject: yabridge: fix notifications by hardcoding dbus --- pkgs/tools/audio/yabridge/default.nix | 1 + pkgs/tools/audio/yabridge/hardcode-dependencies.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) (limited to 'pkgs/tools/audio') diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 57534b93a6ff6..6c11d1d116020 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -98,6 +98,7 @@ multiStdenv.mkDerivation (finalAttrs: { # Hard code bitbridge & runtime dependencies (substituteAll { src = ./hardcode-dependencies.patch; + libdbus = dbus.lib; libxcb32 = pkgsi686Linux.xorg.libxcb; inherit wine; }) diff --git a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch index bd9e08bc6cf3e..d33bdf30eed23 100644 --- a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch +++ b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch @@ -11,6 +11,21 @@ index c602c5ad..a52e20a1 100644 endif # These are all headers-only libraries, and thus won't require separate 32-bit +diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp +index 66e08527..685c54af 100644 +--- a/src/common/notifications.cpp ++++ b/src/common/notifications.cpp +@@ -29,8 +29,8 @@ + #include "process.h" + #include "utils.h" + +-constexpr char libdbus_library_name[] = "libdbus-1.so.3"; +-constexpr char libdbus_library_fallback_name[] = "libdbus-1.so"; ++constexpr char libdbus_library_name[] = "@libdbus@/lib/libdbus-1.so.3"; ++constexpr char libdbus_library_fallback_name[] = "@libdbus@/lib/libdbus-1.so"; + + std::atomic libdbus_handle = nullptr; + std::mutex libdbus_mutex; diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp index 82db99a5..491f005d 100644 --- a/src/plugin/utils.cpp -- cgit 1.4.1 From aa263fc8a00458a08837f7c8753f9c485becaf85 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 1 Apr 2024 21:08:13 -0400 Subject: yabridge: workaround for wine 9.5 --- pkgs/tools/audio/yabridge/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/audio') diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 6c11d1d116020..05982bc10e83a 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -149,10 +149,11 @@ multiStdenv.mkDerivation (finalAttrs: { # Hard code wine path in wrapper scripts generated by winegcc postFixup = '' - for exe in "$out"/bin/*.exe; do - substituteInPlace "$exe" \ - --replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine"' - done + substituteInPlace "$out/bin/yabridge-host-32.exe" \ + --replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine"' + + substituteInPlace "$out/bin/yabridge-host.exe" \ + --replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine64"' ''; passthru.updateScript = nix-update-script { }; -- cgit 1.4.1