From 7a5f534ceee694d7efc2272c177e4918a1ad13bd Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Fri, 21 Nov 2025 15:14:15 -0800
Subject: [PATCH 1/2] aapt: set for x86_64-linux

(cherry picked from commit 29ef0be5c7c9cb8a9aec7df1e73431dcf20d8fd1)
---
 pkgs/by-name/aa/aapt/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/aa/aapt/package.nix b/pkgs/by-name/aa/aapt/package.nix
index c7767eebe559..7fa35b3f3942 100644
--- a/pkgs/by-name/aa/aapt/package.nix
+++ b/pkgs/by-name/aa/aapt/package.nix
@@ -52,11 +52,7 @@ stdenvNoCC.mkDerivation rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ linsui ];
     teams = [ lib.teams.android ];
-    platforms = lib.platforms.unix;
-    badPlatforms = [
-      # The linux executable only supports x86_64
-      "aarch64-linux"
-    ];
+    platforms = lib.platforms.darwin ++ [ "x86_64-linux" ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 }

From 861e3956379cd51a03fcfad857c8ed5e8426fa70 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Fri, 21 Nov 2025 15:33:08 -0800
Subject: [PATCH 2/2] diffoscope: fix aarch64-linux eval

(cherry picked from commit 00bca9c4a83fff77657450e5704b89e0b7082667)
---
 pkgs/by-name/di/diffoscope/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index c3b3324d098b..48613d736d09 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -209,11 +209,9 @@ python.pkgs.buildPythonApplication rec {
     ])
     ++ lib.optionals enableBloat (
       [
-        aapt
         abootimg
         apksigcopier
         apksigner
-        apktool
         cbfstool
         colord
         enjarify
@@ -257,6 +255,12 @@ python.pkgs.buildPythonApplication rec {
       ])
       # oggvideotools is broken on Darwin, please put it back when it will be fixed?
       ++ lib.optionals stdenv.hostPlatform.isLinux [ oggvideotools ]
+      # Causes an eval failure
+      # See https://github.com/NixOS/nixpkgs/issues/463873
+      ++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) [
+        aapt
+        apktool
+      ]
     )
   );