diff options
author | Kevin Cox <kevincox@kevincox.ca> | 2019-10-31 22:26:41 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-31 22:26:41 +0000 |
commit | e12df0e9ce98c1f64f87689c6ec9946f85c9608d (patch) | |
tree | ce3e3798a6296deed5a4cafa894cf0abdbe6ae49 | |
parent | fb5130d79a9621e97e16c5fe976f9107b4287c9d (diff) | |
parent | 6b61d85a9d08e9d9f70a8d9abdb2f964e123f33c (diff) | |
download | nixlib-e12df0e9ce98c1f64f87689c6ec9946f85c9608d.tar nixlib-e12df0e9ce98c1f64f87689c6ec9946f85c9608d.tar.gz nixlib-e12df0e9ce98c1f64f87689c6ec9946f85c9608d.tar.bz2 nixlib-e12df0e9ce98c1f64f87689c6ec9946f85c9608d.tar.lz nixlib-e12df0e9ce98c1f64f87689c6ec9946f85c9608d.tar.xz nixlib-e12df0e9ce98c1f64f87689c6ec9946f85c9608d.tar.zst nixlib-e12df0e9ce98c1f64f87689c6ec9946f85c9608d.zip |
Merge pull request #71122 from NixOS/kevincox-oa_ded
Make oa_ded link as well as openarena.
-rw-r--r-- | pkgs/games/openarena/default.nix | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 63abc5d609c0..1e839c46f0fe 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -16,33 +16,28 @@ stdenv.mkDerivation { gameDir = "$out/openarena-$version"; interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; libPath = stdenv.lib.makeLibraryPath [ SDL libglvnd libogg libvorbis curl openal ]; + arch = { + "x86_64-linux" = "x86_64"; + "i386-linux" = "i386"; + }.${stdenv.hostPlatform.system}; in '' mkdir -pv $out/bin cd $out unzip $src - ${if stdenv.hostPlatform.system == "x86_64-linux" then '' - patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.x86_64" - makeWrapper "${gameDir}/openarena.x86_64" "$out/bin/openarena" \ - --prefix LD_LIBRARY_PATH : "${libPath}" - patchelf --set-interpreter "${interpreter}" "${gameDir}/oa_ded.x86_64" - makeWrapper "${gameDir}/oa_ded.x86_64" "$out/bin/openarena-server" \ - --prefix LD_LIBRARY_PATH : "${libPath}" - '' else '' - patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.i386" - makeWrapper "${gameDir}/openarena.i386" "$out/bin/openarena" \ - --prefix LD_LIBRARY_PATH : "${libPath}" - patchelf --set-interpreter "${interpreter}" "${gameDir}/oa_ded.i386" - makeWrapper "${gameDir}/oa_ded.i386" "$out/bin/openarena-server" \ - --prefix LD_LIBRARY_PATH : "${libPath}" - ''} + patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.${arch}" + patchelf --set-interpreter "${interpreter}" "${gameDir}/oa_ded.${arch}" + + makeWrapper "${gameDir}/openarena.${arch}" "$out/bin/openarena" \ + --prefix LD_LIBRARY_PATH : "${libPath}" + makeWrapper "${gameDir}/oa_ded.${arch}" "$out/bin/oa_ded" ''; meta = { description = "Crossplatform openarena client"; homepage = http://openarena.ws/; maintainers = [ stdenv.lib.maintainers.wyvie ]; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i386-linux" "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; }; } |