From f114118842e19ced171fd634d6ff70a92746f2cb Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 5 Mar 2018 20:12:44 +0000 Subject: SDL, SDL2: don't link statically to any of the inputs --- pkgs/development/libraries/SDL/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'pkgs/development/libraries/SDL') diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 8af3f0a548c8e..2e6c78fdf2397 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -17,17 +17,10 @@ assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGL let - # XXX: By default, SDL wants to dlopen() PulseAudio, in which case - # we must arrange to add it to its RPATH; however, `patchelf' seems - # to fail at doing this, hence `--disable-pulseaudio-shared'. configureFlagsFun = attrs: [ "--disable-oss" "--disable-video-x11-xme" - "--disable-x11-shared" - "--disable-alsa-shared" "--enable-rpath" - "--disable-pulseaudio-shared" - "--disable-osmesa-shared" ] ++ optional (!x11Support) "--without-x" ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"; @@ -47,7 +40,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = [ ] ++ optionals x11Support [ libXext libICE libXrandr ] ++ optional stdenv.isLinux libcap @@ -114,6 +106,15 @@ stdenv.mkDerivation rec { moveToOutput share/aclocal "$dev" ''; + # See the same place in the expression for SDL2 + postFixup = '' + for lib in $out/lib/*.so* ; do + if [[ -L "$lib" ]]; then + patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath propagatedBuildInputs}" "$lib" + fi + done + ''; + setupHook = ./setup-hook.sh; passthru = { inherit openglSupport; }; -- cgit 1.4.1