summary refs log tree commit diff
path: root/pkgs/games/planetaryannihilation
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-10-03 16:49:13 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-10-03 16:49:36 +0200
commitc071e4aab42baf2ce7f57a4112c2c819954bb210 (patch)
tree794665d41fa3bc074f2fbc93ef544c352a3ec4de /pkgs/games/planetaryannihilation
parentc8d9e2fb67ee5a17e7cfd08003dff59974a1b3e3 (diff)
downloadnixlib-c071e4aab42baf2ce7f57a4112c2c819954bb210.tar
nixlib-c071e4aab42baf2ce7f57a4112c2c819954bb210.tar.gz
nixlib-c071e4aab42baf2ce7f57a4112c2c819954bb210.tar.bz2
nixlib-c071e4aab42baf2ce7f57a4112c2c819954bb210.tar.lz
nixlib-c071e4aab42baf2ce7f57a4112c2c819954bb210.tar.xz
nixlib-c071e4aab42baf2ce7f57a4112c2c819954bb210.tar.zst
nixlib-c071e4aab42baf2ce7f57a4112c2c819954bb210.zip
planetary-annihilation: fixup to use multiple-output paths
Hopefully... there are way too many similar references everywhere.
Diffstat (limited to 'pkgs/games/planetaryannihilation')
-rw-r--r--pkgs/games/planetaryannihilation/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index ed682e7bed93..cf968c08287e 100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
@@ -34,12 +34,12 @@ stdenv.mkDerivation {
     ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
 
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" 
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" 
 
-    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64"
+    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64"
 
     for f in $out/lib/*; do
-      patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xorg.libX11 stdenv.glibc xorg.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f
+      patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" $f
     done
   '';