From eb503ba647d9b9f9ac5cb11359b21f1c52a72268 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Tue, 24 Mar 2026 09:29:49 -0400
Subject: [PATCH] Fix android builds on nix, might need further cleanup later

---
 flake.nix       | 27 +++++++++++++++------------
 nix/android.nix |  3 +--
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4922db7..ea6ed1c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,28 +38,31 @@
             };
           };
 
-          devShells =
+          devShells.default =
             let
+              android = pkgs.callPackage ./nix/android.nix { };
+            in
+            pkgs.mkShell {
               packages = with pkgs; [
                 go
                 git
+                jdk17
+                flutter
+                android.platform-tools
               ];
 
-              env = {
+              env = rec {
                 LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.libclang ];
                 LD_LIBRARY_PATH = "./build/native_assets/linux:${lib.makeLibraryPath [ pkgs.zlib ]}";
                 CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ];
-              };
-            in
-            {
-              default = pkgs.mkShell {
-                inherit env;
-                packages = packages ++ [
-                  pkgs.flutter
-                ];
-              };
 
-              nix = pkgs.mkShell { inherit packages env; };
+                ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
+                ANDROID_SDK_ROOT = ANDROID_HOME;
+                JAVA_HOME = pkgs.jdk17;
+
+                TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}";
+                GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2";
+              };
             };
         };
     };
diff --git a/nix/android.nix b/nix/android.nix
index f373968..842597f 100644
--- a/nix/android.nix
+++ b/nix/android.nix
@@ -15,6 +15,5 @@ androidenv.composeAndroidPackages {
     "arm64-v8a"
   ];
   includeNDK = true;
-  ndkVersions = [ "27.0.12077973" ];
-
+  ndkVersions = [ "28.2.13676358" ];
 }