Unverified Commit 8c5c6b0b authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #232405 from K900/pipewire-0.3.71 

[staging-next] Pipewire 0.3.71
parents b2982669 8c4008db

pkgs/development/libraries/libcamera/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ 


stdenv.mkDerivation rec {

  pname = "libcamera";

  version = "0.0.3";

  version = "0.0.5";



  src = fetchgit {

    url = "https://git.libcamera.org/libcamera/libcamera.git";

    rev = "v${version}";

    hash = "sha256-0/wvH07bJRKFwYnOARRJNzH8enIX3TNnWQnJdfpfvgE=";

    hash = "sha256-rd1YIEosg4+H/FJBYCoxdQlV9F0evU5fckHJrSdVPOE=";

  };



  outputs = [ "out" "dev" "doc" ];

pkgs/development/libraries/pipewire/0060-libjack-path.patch

0 → 100644
+26 −0
Original line number Diff line number Diff line 
diff --git a/src/modules/meson.build b/src/modules/meson.build

index 5d2dc9984..35f5773aa 100644

--- a/src/modules/meson.build

+++ b/src/modules/meson.build

@@ -169,6 +169,7 @@ if build_module_jack_tunnel

     install_dir : modules_install_dir,

     install_rpath: modules_install_dir,

     dependencies : [mathlib, dl_lib, pipewire_dep],

+    c_args: '-DNIXPKGS_LIBJACK_PATH="@0@"'.format(jack_dep.get_variable('libdir'))

   )

   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

--- 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)

 

 		search_dirs = getenv("LIBJACK_PATH");

 		if (!search_dirs)

-			search_dirs = PREFIX "/lib64/:" PREFIX "/lib/:"

-				"/usr/lib64/:/usr/lib/:" LIBDIR;

+			search_dirs = NIXPKGS_LIBJACK_PATH;

 

 		while ((p = pw_split_walk(search_dirs, ":", &len, &state))) {

 			int pathlen;

pkgs/development/libraries/pipewire/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ let 


  self = stdenv.mkDerivation rec {

    pname = "pipewire";

    version = "0.3.70";

    version = "0.3.71";



    outputs = [

      "out"
@@ -91,7 +91,7 @@ let 
      owner = "pipewire";

      repo = "pipewire";

      rev = version;

      sha256 = "sha256-xhJzE6JcfNcLMm+TqTIPaBEnEthEqUZiTqhWz1fO5Ng=";

      sha256 = "sha256-NPYWl+WeI/z70gNHX1BAKslGFX634D7XrV04vuJgGOo=";

    };



    patches = [
@@ -99,6 +99,8 @@ let 
      ./0040-alsa-profiles-use-libdir.patch

      # Change the path of the pipewire-pulse binary in the service definition.

      ./0050-pipewire-pulse-path.patch

      # Load libjack from a known location

      ./0060-libjack-path.patch

      # Move installed tests into their own output.

      ./0070-installed-tests-path.patch

      # Add option for changing the config install directory