Merge pull request #157 from lizelive/main

xbuild

Author: Schmarni-Dev

flake.lock

@@ -8,18 +8,20 @@
     flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = {
-    self,
-    nixpkgs,
-    fenix,
-    flake-utils,
-  }:
+  outputs =
+    { self
+    , nixpkgs
+    , fenix
+    , flake-utils
+    ,
+    }:
     flake-utils.lib.eachDefaultSystem (
-      system: let
+      system:
+      let
         # setup pkgs
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [fenix.overlays.default];
+          overlays = [ fenix.overlays.default ];
           config = {
             android_sdk.accept_license = true;
             allowUnfree = true;
@@ -41,19 +43,34 @@
             targets.x86_64-pc-windows-gnu.stable.rust-std
           ];
         androidComposition = pkgs.androidenv.composeAndroidPackages {
-          abiVersions = ["arm64-v8a"];
+          abiVersions = [ "arm64-v8a" ];
           includeNDK = true;
-          platformVersions = ["32"];
+          platformVersions = [ "32" ];
         };
-      in {
+        androidStudio = pkgs.android-studio.withSdk androidComposition.androidsdk;
+        xbuild = pkgs.callPackage ./xbuild { };
+      in
+      {
+        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
@@ -102,12 +119,14 @@
             ];
 
           # android vars
-          ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
-          ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle";
+          ANDROID_HOME = "${androidComposition.androidsdk}/libexec/android-sdk";
+          ANDROID_NDK_ROOT = "${ANDROID_HOME}/ndk-bundle";
 
           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;