From 2e4169187f3616320a0eff25db6b1db296960caf Mon Sep 17 00:00:00 2001
From: Lize Live <huggingface@lize.live>
Date: Thu, 17 Oct 2024 16:20:01 -0700
Subject: [PATCH] add android build tools

---
 flake.nix | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index c0aaafa..867d68b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,17 +47,29 @@
           includeNDK = true;
           platformVersions = [ "32" ];
         };
+        androidStudio = pkgs.android-studio.withSdk androidComposition.androidsdk;
+        xbuild = pkgs.callPackage ./xbuild { };
       in
       {
-        packages.default = pkgs.callPackage ./xbuild { };
+        packages.default = xbuild;
         devShells.default = pkgs.mkShell rec {
           # build dependencies
           nativeBuildInputs = with pkgs; [
+            jdk
+            kotlin
+            gradle
+            squashfsTools
+            clang
+            lldb
+            libllvm
+            lld
+            androidComposition.androidsdk
+            
             # the entire rust toolchain
             rustToolchain
+
             # tool for cross compiling
-            cargo-apk
-            # xbuild
+            xbuild
 
             pkg-config
             openssl
@@ -112,6 +124,8 @@
           LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
           # this is most likely not needed. for some reason shadows flicker without it.
           AMD_VULKAN_ICD = "RADV";
+
+
         };
         # This only formats the nix files.
         formatter = pkgs.nixpkgs-fmt;