Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7d592a3c3065
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 995fbac56f62
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 25, 2019

  1. openarena: oa_ded link.

    @kevincox
    kevincox committed Oct 25, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    995fbac View commit details
Showing with 11 additions and 10 deletions.
  1. +11 −10 pkgs/games/openarena/default.nix
21 changes: 11 additions & 10 deletions pkgs/games/openarena/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,27 +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}"
'' 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}/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;
};
}