From 284adcab1f31d3c9ddb375e1c4830297a24e234f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 12 Oct 2022 20:02:26 +0200 Subject: [PATCH] zeroad: fix build on aarch64-linux --- pkgs/games/0ad/game.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 23e906703f43..488ef0c91e17 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation rec { "-I${libXcursor.dev}/include/X11" "-I${SDL2}/include/SDL2" "-I${fmt.dev}/include" + "-I${nvidia-texture-tools.dev}/include" + ]; + + NIX_CFLAGS_LINK = toString [ + "-L${nvidia-texture-tools.lib}/lib/static" ]; patches = [ ./rootdir_env.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e7546d684a7..a94858c82f76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34528,7 +34528,7 @@ with pkgs; keen4 = callPackage ../games/keen4 { }; zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad { - wxGTK = wxGTK31; + wxGTK = wxGTK32; }); zeroad = zeroadPackages.zeroad;