From 52b9350bc85fce3c68d8bafa509b97ebb4b5ee7c Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz@zw3rk.com>
Date: Thu, 15 Oct 2026 17:50:10 +0900
Subject: [PATCH] Include the NDK composition SDK tools in Android evaluation

---
 flake.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index d015fb1983..65a89be66e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,20 +20,22 @@
           aarch64-android-prebuilt = import prev.path {
             inherit system;
             inherit (prev) overlays;
-            # The prebuilt Android NDK and its compiler wrappers are unfree.
+            # Nixpkgs marks the prebuilt NDK, SDK tools, and wrappers unfree.
             config = prev.config // {
               allowUnfreePredicate = package:
-                prev.lib.hasInfix "ndk" (prev.lib.getName package);
+                let name = prev.lib.getName package; in
+                prev.lib.hasInfix "ndk" name || prev.lib.hasPrefix "android-sdk-" name;
             };
             crossSystem = prev.lib.systems.examples.aarch64-android-prebuilt // { androidSdkVersion = "26"; };
           };
           armv7a-android-prebuilt = import prev.path {
             inherit system;
             inherit (prev) overlays;
-            # The prebuilt Android NDK and its compiler wrappers are unfree.
+            # Nixpkgs marks the prebuilt NDK, SDK tools, and wrappers unfree.
             config = prev.config // {
               allowUnfreePredicate = package:
-                prev.lib.hasInfix "ndk" (prev.lib.getName package);
+                let name = prev.lib.getName package; in
+                prev.lib.hasInfix "ndk" name || prev.lib.hasPrefix "android-sdk-" name;
             };
             crossSystem = prev.lib.systems.examples.armv7a-android-prebuilt // { androidSdkVersion = "26"; };
           };