tjh.dev
1diff --git a/meson.build b/meson.build
2index 9e69128d..8c53ac88 100644
3--- a/meson.build
4+++ b/meson.build
5@@ -226,7 +226,7 @@ if is_64bit_system
6 xcb_64bit_dep = dependency('xcb')
7 endif
8 if with_bitbridge
9- xcb_32bit_dep = winegcc.find_library('xcb')
10+ xcb_32bit_dep = winegcc.find_library('xcb', dirs: ['@libxcb32@/lib'])
11 endif
12
13 # These are all headers-only libraries, and thus won't require separate 32-bit
14diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp
15index 654b6c83..78ba2fe7 100644
16--- a/src/common/notifications.cpp
17+++ b/src/common/notifications.cpp
18@@ -29,8 +29,8 @@
19 #include "process.h"
20 #include "utils.h"
21
22-constexpr char libdbus_library_name[] = "libdbus-1.so.3";
23-constexpr char libdbus_library_fallback_name[] = "libdbus-1.so";
24+constexpr char libdbus_library_name[] = "@libdbus@/lib/libdbus-1.so.3";
25+constexpr char libdbus_library_fallback_name[] = "@libdbus@/lib/libdbus-1.so";
26
27 std::atomic<void*> libdbus_handle = nullptr;
28 std::mutex libdbus_mutex;
29diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
30index 441345c6..f3e51cff 100644
31--- a/src/plugin/utils.cpp
32+++ b/src/plugin/utils.cpp
33@@ -103,7 +103,7 @@ std::string PluginInfo::wine_version() const {
34 // The '*.exe' scripts generated by winegcc allow you to override the binary
35 // used to run Wine, so will will handle this in the same way for our Wine
36 // version detection. We'll be using `execvpe`
37- std::string wine_path = "wine";
38+ std::string wine_path = "@wine@/bin/wine";
39 // NOLINTNEXTLINE(concurrency-mt-unsafe)
40 if (const char* wineloader_path = getenv("WINELOADER");
41 wineloader_path && access(wineloader_path, X_OK) == 0) {