Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/src/modules/meson.build b/src/modules/meson.build 2index 5d2dc9984..35f5773aa 100644 3--- a/src/modules/meson.build 4+++ b/src/modules/meson.build 5@@ -169,6 +169,7 @@ if build_module_jack_tunnel 6 install_dir : modules_install_dir, 7 install_rpath: modules_install_dir, 8 dependencies : [mathlib, dl_lib, pipewire_dep], 9+ c_args: '-DNIXPKGS_LIBJACK_PATH="@0@"'.format(jack_dep.get_variable('libdir')) 10 ) 11 build_module_jackdbus_detect = dbus_dep.found() 12 if build_module_jackdbus_detect 13diff --git a/src/modules/module-jack-tunnel/weakjack.h b/src/modules/module-jack-tunnel/weakjack.h 14index 42580f798..e7aadd3cc 100644 15--- a/src/modules/module-jack-tunnel/weakjack.h 16+++ b/src/modules/module-jack-tunnel/weakjack.h 17@@ -164,8 +164,7 @@ static inline int weakjack_load(struct weakjack *jack, const char *lib) 18 19 search_dirs = getenv("LIBJACK_PATH"); 20 if (!search_dirs) 21- search_dirs = PREFIX "/lib64/:" PREFIX "/lib/:" 22- "/usr/lib64/:/usr/lib/:" LIBDIR; 23+ search_dirs = NIXPKGS_LIBJACK_PATH; 24 25 while ((p = pw_split_walk(search_dirs, ":", &len, &state))) { 26 int pathlen;