From c0c4c02815fa68a7004ffc4ebed48fcc0e44da13 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 16 Nov 2025 13:16:05 -0500 Subject: [PATCH] comment out android stuff for now --- flake.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 8f2ed25..d49198f 100644 --- a/flake.nix +++ b/flake.nix @@ -38,26 +38,27 @@ }; devShells.default = - let - android = pkgs.callPackage ./nix/android.nix { }; - in + # let + # android = pkgs.callPackage ./nix/android.nix { }; + # in pkgs.mkShell { packages = with pkgs; [ - jdk17 + # jdk17 cargo flutter - android.platform-tools + # android.platform-tools (pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh)) ]; - env = rec { - LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath (with pkgs; [ sqlite ])}:$LD_LIBRARY_PATH"; + env = { + # env = rec { + LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath (with pkgs; [ sqlite ])}"; - ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk"; - ANDROID_SDK_ROOT = ANDROID_HOME; - JAVA_HOME = pkgs.jdk17; + # 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"; + # TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}"; + # GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2"; }; }; };