about summary refs log tree commit diff
path: root/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch
blob: c657cd7d56b27477d5cb573b89ffda8915cfe1f2 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
diff --git a/meson.build b/meson.build
index d8d9135b..717280d9 100644
--- a/meson.build
+++ b/meson.build
@@ -221,7 +221,7 @@ if is_64bit_system
   xcb_64bit_dep = dependency('xcb')
 endif
 if with_32bit_libraries or with_bitbridge
-  xcb_32bit_dep = winegcc.find_library('xcb')
+  xcb_32bit_dep = winegcc.find_library('xcb', dirs: ['@libxcb32@/lib'])
 endif
 
 # These are all headers-only libraries, and thus won't require separate 32-bit
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
index 4a52b6c1..abbb1ec8 100644
--- a/src/plugin/utils.cpp
+++ b/src/plugin/utils.cpp
@@ -101,7 +101,7 @@ std::string PluginInfo::wine_version() const {
     // The '*.exe' scripts generated by winegcc allow you to override the binary
     // used to run Wine, so will will handle this in the same way for our Wine
     // version detection. We'll be using `execvpe`
-    std::string wine_path = "wine";
+    std::string wine_path = "@wine@/bin/wine";
     // NOLINTNEXTLINE(concurrency-mt-unsafe)
     if (const char* wineloader_path = getenv("WINELOADER");
         wineloader_path && access(wineloader_path, X_OK) == 0) {