From 37053d45f94e70493cbcd4808f761a797d210701 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 12 Oct 2022 20:02:11 +0200
Subject: [PATCH 1/2] nvidia-texture-tools: unstable-2019-10-27 ->
 unstable-2020-12-21

---
 .../nvidia-texture-tools/default.nix          | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix
index 676245967202..3a907a6ba79d 100644
--- a/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix
@@ -2,22 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "nvidia-texture-tools";
-  version = "unstable-2019-10-27";
+  version = "unstable-2020-12-21";
 
   src = fetchFromGitHub {
     owner = "castano";
     repo = "nvidia-texture-tools";
-    rev = "a131e4c6b0b7c9c73ccc3c9e6f1c7e165be86bcc";
-    sha256 = "1qzyr3ib5dpxyq1y33lq02qv4cww075sm9bm4f651d34q5x38sk3";
+    rev = "aeddd65f81d36d8cb7b169b469ef25156666077e";
+    sha256 = "sha256-BYNm8CxPQbfmnnzNmOQ2Dc8HSyO8mkqzYsBZ5T80398=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/castano/nvidia-texture-tools/commit/6474f2593428d89ec152da2502aa136ababe66ca.patch";
-      sha256 = "0akbkvm55hiv58jx71h9hj173rbnqlb5a430y9azjiix7zga42vd";
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
 
   outputs = [ "out" "dev" "lib" ];
@@ -26,6 +19,10 @@ stdenv.mkDerivation rec {
     # Make a recently added pure virtual function just virtual,
     # to keep compatibility.
     sed -i 's/virtual void endImage() = 0;/virtual void endImage() {}/' src/nvtt/nvtt.h
+  '' + lib.optionalString stdenv.isAarch64 ''
+    # remove x86_64-only libraries
+    sed -i '/bc1enc/d' src/nvtt/tests/CMakeLists.txt
+    sed -i '/libsquish/d;/CMP_Core/d' extern/CMakeLists.txt
   '';
 
   cmakeFlags = [
@@ -42,6 +39,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/castano/nvidia-texture-tools";
     license = licenses.mit;
     platforms = platforms.unix;
-    broken = stdenv.isAarch64;
+    maintainers = with maintainers; [ wegank ];
   };
 }

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 2/2] 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;