From aa9f7d997c2cd80bf554d7fbacdbd4dda27c477f Mon Sep 17 00:00:00 2001
From: Fabien Freling <public@ffreling.com>
Date: Wed, 20 Dec 2023 22:42:14 +0100
Subject: [PATCH] add android sdk

---
 flake.nix | 24 +++++++++++++++++++-----
 justfile  |  2 +-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0f15fd7..fd5d7fb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,17 +22,31 @@
           # NOTE: zig overlay triggers issues with X11/GL libraries
           # This might be misconfiguration on my end
           overlays = [ ];
-          config = { };
+          config = {
+            allowUnfree = true;
+            android_sdk.accept_license = true;
+          };
         };
 
         formatter = pkgs.nixfmt;
 
         devShells.default = with pkgs;
           mkShell {
-            LD_LIBRARY_PATH = lib.makeLibraryPath [ stdenv.cc.cc ]; # For libstdc++.so.6
-            ANDROID_HOME = "foo/bar";
-            
-            nativeBuildInputs = [ clang just android-tools godot_4 ];
+            LD_LIBRARY_PATH =
+              lib.makeLibraryPath [ stdenv.cc.cc ]; # For libstdc++.so.6
+            ANDROID_HOME = "${androidenv.androidPkgs_9_0.androidsdk}/libexec/android-sdk";
+
+            nativeBuildInputs = [
+              clang
+              just
+
+              godot_4
+              
+              android-tools
+              androidenv.androidPkgs_9_0.androidsdk
+              androidenv.androidPkgs_9_0.platform-tools
+              jre_headless
+            ];
             buildInputs = [ sqlite ];
           };
       };
diff --git a/justfile b/justfile
index d79686d..bbc2a0a 100644
--- a/justfile
+++ b/justfile
@@ -4,7 +4,7 @@ alias t := test
 alias fmt := format
 
 edit:
-    godot4 --editor godot/project.godot
+    godot4 --editor --quiet godot/project.godot
         
 pre-build:
     git submodule update --init --recursive