diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-30 23:56:43 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-05-01 00:13:23 +0300 |
| commit | 87ebab128a466b6b3ac60711621ba6264cb7075a (patch) | |
| tree | 1053a6f00009931dafa4d781298b27d26fb8ae53 /pkgs/games | |
| parent | 3994a236bb004b8244ead60f0085a657121ed956 (diff) | |
| download | nixpkgs-87ebab128a466b6b3ac60711621ba6264cb7075a.tar nixpkgs-87ebab128a466b6b3ac60711621ba6264cb7075a.tar.gz nixpkgs-87ebab128a466b6b3ac60711621ba6264cb7075a.tar.bz2 nixpkgs-87ebab128a466b6b3ac60711621ba6264cb7075a.tar.lz nixpkgs-87ebab128a466b6b3ac60711621ba6264cb7075a.tar.xz nixpkgs-87ebab128a466b6b3ac60711621ba6264cb7075a.tar.zst nixpkgs-87ebab128a466b6b3ac60711621ba6264cb7075a.zip | |
replace ${stdenv.cc.cc}/lib occurences
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/andyetitmoves/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/oilrush/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/games/spring/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/tibia/default.nix | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 897e4202b80..092f0773708 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{opt/andyetitmoves,bin} cp -r * $out/opt/andyetitmoves/ - fullPath=${stdenv.cc.cc}/lib64 + fullPath=${stdenv.cc.cc.lib}/lib64 for i in $nativeBuildInputs; do fullPath=$fullPath''${fullPath:+:}$i/lib done diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index ec9c928b798..7a23c4dc966 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -27,25 +27,25 @@ stdenv.mkDerivation { do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f done - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ launcher_$arch - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ libNetwork_$arch.so - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ libQtCoreUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ libQtGuiUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ libQtNetworkUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ libQtWebKitUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ libQtXmlUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib\ libRakNet_$arch.so - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ libUnigine_$arch.so - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ OilRush_$arch ''; installPhase = '' diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index fe764c90b4b..525adbc0a12 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/spring" \ - --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc}/lib::${systemd}/lib" + --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc.lib}/lib::${systemd}/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 1af750f462a..26b1f9c9da2 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { cp -r * $out/res patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.cc.cc}/lib:${libX11}/lib:${mesa}/lib \ + --set-rpath ${stdenv.cc.cc.lib}/lib:${libX11}/lib:${mesa}/lib \ "$out/res/Tibia" # We've patchelf'd the files. The main ‘Tibia’ binary is a bit |