diff --git a/meson.build b/meson.build index bfab6361..9085db0f 100644 --- a/meson.build +++ b/meson.build @@ -187,7 +187,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/common/notifications.cpp b/src/common/notifications.cpp index da27a1bf..18482e06 100644 --- a/src/common/notifications.cpp +++ b/src/common/notifications.cpp @@ -49,7 +49,7 @@ bool send_notification(const std::string& title, } } - Process process("notify-send"); + Process process("@libnotify@/bin/notify-send"); process.arg("--urgency=normal"); process.arg("--app-name=yabridge"); process.arg(title); diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp index acd431bc..8566281c 100644 --- a/src/plugin/utils.cpp +++ b/src/plugin/utils.cpp @@ -93,7 +93,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) {