diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-06-08 22:35:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-08 22:35:16 +0200 |
| commit | add4fcb2be71a2bd5ae0218b60463551f9e26d96 (patch) | |
| tree | dbd042b09dbc0b496ab9408a800b7066c90e21f5 /pkgs/games | |
| parent | c3c768577f9d81eef5f56a742793b2cc7709503c (diff) | |
| parent | 04f7ef92911dfa1872a616b548caf2459044f4ed (diff) | |
Merge pull request #317849 from ExpidusOS/fix/quake-aarch64
quake3e: fix compiling for aarch64
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/quake3/quake3e/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index de6a842cc1332..1ad03d494ab03 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -15,7 +15,11 @@ , copyDesktopItems , makeDesktopItem }: - +let + arch = + /**/ if stdenv.hostPlatform.isx86_64 then "x64" + else stdenv.hostPlatform.parsed.cpu.name; +in stdenv.mkDerivation rec { pname = "Quake3e"; version = "2022-04-01-dev"; @@ -52,8 +56,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall make install DESTDIR=$out/lib - makeWrapper $out/lib/quake3e.x64 $out/bin/quake3e - makeWrapper $out/lib/quake3e.ded.x64 $out/bin/quake3e.ded + makeWrapper $out/lib/quake3e.${arch} $out/bin/quake3e + makeWrapper $out/lib/quake3e.ded.${arch} $out/bin/quake3e.ded runHook postInstall ''; @@ -72,8 +76,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pmiddend ]; - badPlatforms = platforms.aarch64; - # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; }; } |