Merge pull request #303485 from kira-bruneau/yabridge
yabridge: workaround for wine 9.5
This commit is contained in:
commit
0c97ced70e
|
@ -98,6 +98,7 @@ multiStdenv.mkDerivation (finalAttrs: {
|
||||||
# Hard code bitbridge & runtime dependencies
|
# Hard code bitbridge & runtime dependencies
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./hardcode-dependencies.patch;
|
src = ./hardcode-dependencies.patch;
|
||||||
|
libdbus = dbus.lib;
|
||||||
libxcb32 = pkgsi686Linux.xorg.libxcb;
|
libxcb32 = pkgsi686Linux.xorg.libxcb;
|
||||||
inherit wine;
|
inherit wine;
|
||||||
})
|
})
|
||||||
|
@ -148,10 +149,11 @@ multiStdenv.mkDerivation (finalAttrs: {
|
||||||
|
|
||||||
# Hard code wine path in wrapper scripts generated by winegcc
|
# Hard code wine path in wrapper scripts generated by winegcc
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
for exe in "$out"/bin/*.exe; do
|
substituteInPlace "$out/bin/yabridge-host-32.exe" \
|
||||||
substituteInPlace "$exe" \
|
--replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine"'
|
||||||
--replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine"'
|
|
||||||
done
|
substituteInPlace "$out/bin/yabridge-host.exe" \
|
||||||
|
--replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine64"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
|
@ -11,6 +11,21 @@ index c602c5ad..a52e20a1 100644
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# These are all headers-only libraries, and thus won't require separate 32-bit
|
# 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<void*> libdbus_handle = nullptr;
|
||||||
|
std::mutex libdbus_mutex;
|
||||||
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
|
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
|
||||||
index 82db99a5..491f005d 100644
|
index 82db99a5..491f005d 100644
|
||||||
--- a/src/plugin/utils.cpp
|
--- a/src/plugin/utils.cpp
|
||||||
|
|
Loading…
Reference in New Issue
Block a user