gitignore freezed

This commit is contained in:
Henry Hiles 2025-11-23 13:06:05 -05:00
commit 6dafcfad30
No known key found for this signature in database
6 changed files with 9 additions and 1146 deletions

View file

@ -39,15 +39,15 @@
devShells.default =
let
android = pkgs.callPackage ./nix/android.nix { };
# android = pkgs.callPackage ./nix/android.nix { };
in
pkgs.mkShell {
packages = with pkgs; [
jdk17
# jdk17
cargo
(flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; })
android.platform-tools
# android.platform-tools
(pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh))
];
@ -58,12 +58,12 @@
])
}:./build/linux/x64/debug/plugins/flutter_vodozemac";
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";
};
};
};