diff options
| author | Nathaniel Glen <njag2202@gmail.com> | 2020-10-23 13:42:50 -0400 |
|---|---|---|
| committer | Nathaniel Glen <njag2202@gmail.com> | 2020-10-23 13:51:41 -0400 |
| commit | 9397d535bddf4bd296f5d155edf7461d6c379e87 (patch) | |
| tree | 1f3133772c7c8443965f07861b8d4a627d5c351b /pkgs/development/libraries/pipewire | |
| parent | 68fa82a0ae9e11cbf6b05fc4123639ef448766ef (diff) | |
| download | nixpkgs-9397d535bddf4bd296f5d155edf7461d6c379e87.tar nixpkgs-9397d535bddf4bd296f5d155edf7461d6c379e87.tar.gz nixpkgs-9397d535bddf4bd296f5d155edf7461d6c379e87.tar.bz2 nixpkgs-9397d535bddf4bd296f5d155edf7461d6c379e87.tar.lz nixpkgs-9397d535bddf4bd296f5d155edf7461d6c379e87.tar.xz nixpkgs-9397d535bddf4bd296f5d155edf7461d6c379e87.tar.zst nixpkgs-9397d535bddf4bd296f5d155edf7461d6c379e87.zip | |
pipewire: remove pulseaudio references
This replaces the temporary RPATH fix with the new upstream patch from jtojnar. It also removes the reference to the dev output.
Diffstat (limited to 'pkgs/development/libraries/pipewire')
| -rw-r--r-- | pkgs/development/libraries/pipewire/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 153042be774..9d3a6f77ab8 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,6 +1,8 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch +, removeReferencesTo , meson , ninja , systemd @@ -63,8 +65,14 @@ stdenv.mkDerivation rec { ./alsa-profiles-use-libdir.patch # Move installed tests into their own output. ./installed-tests-path.patch - ]; + # TODO Remove this on next update + # Fixes rpath referencecs. + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/2e3556fa128b778be62a7ffad5fbe78393035825.diff"; + sha256 = "039yysb8j1aiqml54rxnaqfmzqz1b6m8sv5w3vz52grvav3kyr1l"; + }) + ]; nativeBuildInputs = [ doxygen @@ -72,6 +80,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig + removeReferencesTo ]; buildInputs = [ @@ -111,12 +120,10 @@ stdenv.mkDerivation rec { doCheck = true; + # Pulseaudio asserts lead to dev references. + # TODO This should be fixed in the pulseaudio sources instead. preFixup = '' - # The rpaths mistakenly points to libpulseaudio instead - for file in "$pulse"/lib/*.so; do - oldrpath="$(patchelf --print-rpath "$file")" - patchelf --set-rpath "$pulse/lib:$oldrpath" "$file" - done + remove-references-to -t ${libpulseaudio.dev} "$(readlink -f $pulse/lib/libpulse.so)" ''; passthru.tests = { |