pulseaudio-modules-bt: Patched rpath takes precedence over original

This fixes a segmentation fault when loaded via pulseaudio's dl-search-path
This commit is contained in:
adisbladis
2018-10-18 16:27:42 +08:00
parent 9fa59b6bc7
commit 613d3bac86
@@ -1,7 +1,6 @@
{ stdenv { stdenv
, runCommand , runCommand
, fetchFromGitHub , fetchFromGitHub
, libpulseaudio
, pulseaudio , pulseaudio
, pkgconfig , pkgconfig
, ffmpeg_4 , ffmpeg_4
@@ -44,7 +43,6 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
libpulseaudio
pulseaudio pulseaudio
ffmpeg_4 ffmpeg_4
libtool libtool
@@ -67,7 +65,7 @@ in stdenv.mkDerivation rec {
for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do
orig_rpath=$(patchelf --print-rpath "$so") orig_rpath=$(patchelf --print-rpath "$so")
patchelf \ 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" "$so"
done done
''; '';