Henry-Hiles/nexus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

comment out android stuff for now

Browse source
This commit is contained in:
Henry Hiles 2025-11-16 13:16:05 -05:00
commit c0c4c02815
No known key found for this signature in database
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
flake.nix
View file

@ -38,26 +38,27 @@
}; };
devShells.default = devShells.default =
let # let
android = pkgs.callPackage ./nix/android.nix { }; # android = pkgs.callPackage ./nix/android.nix { };
in # in
pkgs.mkShell { pkgs.mkShell {
packages = with pkgs; [ packages = with pkgs; [
jdk17 # jdk17
cargo cargo
flutter flutter
android.platform-tools # android.platform-tools
(pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh)) (pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh))
]; ];
env = rec { env = {
LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath (with pkgs; [ sqlite ])}:$LD_LIBRARY_PATH"; # env = rec {
LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath (with pkgs; [ sqlite ])}";
ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk"; # ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
ANDROID_SDK_ROOT = ANDROID_HOME; # ANDROID_SDK_ROOT = ANDROID_HOME;
JAVA_HOME = pkgs.jdk17; # JAVA_HOME = pkgs.jdk17;
TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}"; # TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}";
GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2"; # GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2";
}; };
}; };
}; };