add android sdk

main
Fabien Freling 2023-12-20 22:42:14 +01:00
parent b2c9bbf9a2
commit aa9f7d997c
2 changed files with 20 additions and 6 deletions

View File

@ -22,17 +22,31 @@
# NOTE: zig overlay triggers issues with X11/GL libraries # NOTE: zig overlay triggers issues with X11/GL libraries
# This might be misconfiguration on my end # This might be misconfiguration on my end
overlays = [ ]; overlays = [ ];
config = { }; config = {
allowUnfree = true;
android_sdk.accept_license = true;
};
}; };
formatter = pkgs.nixfmt; formatter = pkgs.nixfmt;
devShells.default = with pkgs; devShells.default = with pkgs;
mkShell { mkShell {
LD_LIBRARY_PATH = lib.makeLibraryPath [ stdenv.cc.cc ]; # For libstdc++.so.6 LD_LIBRARY_PATH =
ANDROID_HOME = "foo/bar"; lib.makeLibraryPath [ stdenv.cc.cc ]; # For libstdc++.so.6
ANDROID_HOME = "${androidenv.androidPkgs_9_0.androidsdk}/libexec/android-sdk";
nativeBuildInputs = [ clang just android-tools godot_4 ];
nativeBuildInputs = [
clang
just
godot_4
android-tools
androidenv.androidPkgs_9_0.androidsdk
androidenv.androidPkgs_9_0.platform-tools
jre_headless
];
buildInputs = [ sqlite ]; buildInputs = [ sqlite ];
}; };
}; };

View File

@ -4,7 +4,7 @@ alias t := test
alias fmt := format alias fmt := format
edit: edit:
godot4 --editor godot/project.godot godot4 --editor --quiet godot/project.godot
pre-build: pre-build:
git submodule update --init --recursive git submodule update --init --recursive