diff --git a/pkgs/by-name/pi/pipewire/0060-libjack-path.patch b/pkgs/by-name/pi/pipewire/0060-libjack-path.patch index 7fde3dbb8faa..1b28d6e340f9 100644 --- a/pkgs/by-name/pi/pipewire/0060-libjack-path.patch +++ b/pkgs/by-name/pi/pipewire/0060-libjack-path.patch @@ -1,8 +1,8 @@ diff --git a/src/modules/meson.build b/src/modules/meson.build -index 5d2dc9984..35f5773aa 100644 +index 59f46ae13..3fa3d9f89 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build -@@ -169,6 +169,7 @@ if build_module_jack_tunnel +@@ -110,6 +110,7 @@ if build_module_jack_tunnel install_dir : modules_install_dir, install_rpath: modules_install_dir, dependencies : [mathlib, dl_lib, pipewire_dep], @@ -11,16 +11,16 @@ index 5d2dc9984..35f5773aa 100644 build_module_jackdbus_detect = dbus_dep.found() if build_module_jackdbus_detect diff --git a/src/modules/module-jack-tunnel/weakjack.h b/src/modules/module-jack-tunnel/weakjack.h -index 42580f798..e7aadd3cc 100644 +index 472adb253..cffca1dde 100644 --- a/src/modules/module-jack-tunnel/weakjack.h +++ b/src/modules/module-jack-tunnel/weakjack.h -@@ -164,8 +164,7 @@ static inline int weakjack_load(struct weakjack *jack, const char *lib) +@@ -167,8 +167,7 @@ static inline int weakjack_load(struct weakjack *jack, const char *lib) - search_dirs = getenv("LIBJACK_PATH"); - if (!search_dirs) -- search_dirs = PREFIX "/lib64/:" PREFIX "/lib/:" -- "/usr/lib64/:/usr/lib/:" LIBDIR; -+ search_dirs = NIXPKGS_LIBJACK_PATH; + search_dirs = getenv("LIBJACK_PATH"); + if (!search_dirs) +- search_dirs = PREFIX "/lib64/:" PREFIX "/lib/:" +- "/usr/lib64/:/usr/lib/:" LIBDIR; ++ search_dirs = NIXPKGS_LIBJACK_PATH; + + res = -ENAMETOOLONG; - while ((p = pw_split_walk(search_dirs, ":", &len, &state))) { - int pathlen; diff --git a/pkgs/by-name/pi/pipewire/package.nix b/pkgs/by-name/pi/pipewire/package.nix index e6e0d575e300..0bfd934ecb21 100644 --- a/pkgs/by-name/pi/pipewire/package.nix +++ b/pkgs/by-name/pi/pipewire/package.nix @@ -89,7 +89,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "pipewire"; - version = "1.6.2"; + version = "1.6.3"; outputs = [ "out" @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "pipewire"; repo = "pipewire"; tag = finalAttrs.version; - hash = "sha256-PG1S70wnyGz9H3TP3gJ2/O+3XnaAyyB4XRM2NFnCWwY="; + hash = "sha256-zD0PYtZsiU+tZUpVBKofjGVQyO/68eIZP7DqBQHUGJk="; }; patches = [