commit 8c4008db557249d7b655c6fca46dc16db6e5e5c0 · pyrox.dev/nixpkgs

+26

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

···

       1
       1
       +
       diff --git a/src/modules/meson.build b/src/modules/meson.build

     

       2
       2
       +
       index 5d2dc9984..35f5773aa 100644

     

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

     

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

     

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

     

       6
       6
       +
            install_dir : modules_install_dir,

     

       7
       7
       +
            install_rpath: modules_install_dir,

     

       8
       8
       +
            dependencies : [mathlib, dl_lib, pipewire_dep],

     

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

     

       10
       10
       +
          )

     

       11
       11
       +
          build_module_jackdbus_detect = dbus_dep.found()

     

       12
       12
       +
          if build_module_jackdbus_detect

     

       13
       13
       +
       diff --git a/src/modules/module-jack-tunnel/weakjack.h b/src/modules/module-jack-tunnel/weakjack.h

     

       14
       14
       +
       index 42580f798..e7aadd3cc 100644

     

       15
       15
       +
       --- a/src/modules/module-jack-tunnel/weakjack.h

     

       16
       16
       +
       +++ b/src/modules/module-jack-tunnel/weakjack.h

     

       17
       17
       +
       @@ -164,8 +164,7 @@ static inline int weakjack_load(struct weakjack *jack, const char *lib)

     

       18
       18
       +
        

     

       19
       19
       +
        		search_dirs = getenv("LIBJACK_PATH");

     

       20
       20
       +
        		if (!search_dirs)

     

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

     

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

     

       23
       23
       +
       +			search_dirs = NIXPKGS_LIBJACK_PATH;

     

       24
       24
       +
        

     

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

     

       26
       26
       +
        			int pathlen;

+4 -2

pkgs/development/libraries/pipewire/default.nix

···

       73
       73
        
       

     

       74
       74
        
         self = stdenv.mkDerivation rec {

     

       75
       75
        
           pname = "pipewire";

     

       76
       76
       -
           version = "0.3.70";

     

       76
       76
       +
           version = "0.3.71";

     

       77
       77
        
       

     

       78
       78
        
           outputs = [

     

       79
       79
        
             "out"

     
···

       91
       91
        
             owner = "pipewire";

     

       92
       92
        
             repo = "pipewire";

     

       93
       93
        
             rev = version;

     

       94
       94
       -
             sha256 = "sha256-xhJzE6JcfNcLMm+TqTIPaBEnEthEqUZiTqhWz1fO5Ng=";

     

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

     

       95
       95
        
           };

     

       96
       96
        
       

     

       97
       97
        
           patches = [

     
···

       99
       99
        
             ./0040-alsa-profiles-use-libdir.patch

     

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

     

       101
       101
        
             ./0050-pipewire-pulse-path.patch

     

       102
       102
       +
             # Load libjack from a known location

     

       103
       103
       +
             ./0060-libjack-path.patch

     

       102
       104
        
             # Move installed tests into their own output.

     

       103
       105
        
             ./0070-installed-tests-path.patch

     

       104
       106
        
             # Add option for changing the config install directory