From 613d3bac86eebfeec082ee742b1706f2cc66c7c1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 18 Oct 2018 03:04:36 +0800 Subject: [PATCH] pulseaudio-modules-bt: Patched rpath takes precedence over original This fixes a segmentation fault when loaded via pulseaudio's dl-search-path --- pkgs/applications/audio/pulseaudio-modules-bt/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 6bb432b3fd8..b377db65c0c 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -1,7 +1,6 @@ { stdenv , runCommand , fetchFromGitHub -, libpulseaudio , pulseaudio , pkgconfig , ffmpeg_4 @@ -44,7 +43,6 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - libpulseaudio pulseaudio ffmpeg_4 libtool @@ -67,7 +65,7 @@ in stdenv.mkDerivation rec { for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do orig_rpath=$(patchelf --print-rpath "$so") patchelf \ - --set-rpath "$orig_rpath:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules" \ + --set-rpath "${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \ "$so" done '';