diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 12:23:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 12:23:56 +0200 |
| commit | f8c211fd2b53d970a439d643bea9d0928fb08666 (patch) | |
| tree | 5084d953ed0e15e81e556c5db1399143c8069fc8 /pkgs/games/oilrush | |
| parent | 32b31398eb562152a11d1be992c5ea6e110013f5 (diff) | |
| download | nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.tar nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.gz nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.bz2 nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.lz nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.xz nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.zst nixpkgs-f8c211fd2b53d970a439d643bea9d0928fb08666.zip | |
fontconfig: split into multiple outputs
Fixed all 'fontconfig}' references as well, hopefully, ugh!
Diffstat (limited to 'pkgs/games/oilrush')
| -rw-r--r-- | pkgs/games/oilrush/default.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index d75f02c5e94..ec9c928b798 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -1,6 +1,8 @@ { stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr , libXrender, fontconfig, freetype, openal }: +with { inherit (stdenv.lib) makeLibraryPath; }; + stdenv.mkDerivation { name = "oilrush"; src = @@ -25,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:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ + patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\ launcher_$arch patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ libNetwork_$arch.so patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ libQtCoreUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ + patchelf --set-rpath ${stdenv.cc.cc}/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\ libQtNetworkUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ + patchelf --set-rpath ${stdenv.cc.cc}/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\ libQtXmlUnigine_$arch.so.4 patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\ libRakNet_$arch.so - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\ + patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ libUnigine_$arch.so - patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\ + patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\ OilRush_$arch ''; installPhase = '' @@ -53,7 +55,7 @@ stdenv.mkDerivation { mkdir -p "$out/bin" cat << EOF > "$out/bin/oilrush" #! /bin/sh - LD_LIBRARY_PATH=.:${openal}/lib:\$LD_LIBRARY_PATH + LD_LIBRARY_PATH=.:${makeLibraryPath [ openal ]}:\$LD_LIBRARY_PATH cd "$out/opt/oilrush" exec ./launcher_$arch.sh "\$@" EOF |