diff options
Diffstat (limited to 'nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix')
-rw-r--r-- | nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix b/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix index aa5337c92988..95f6a3bdbbac 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix @@ -23,14 +23,14 @@ let android = { versions = { tools = "26.1.1"; - platformTools = "30.0.5"; + platformTools = "31.0.2"; buildTools = "30.0.3"; - ndk = "22.0.7026061"; - - # or the LTS NDK: - # ndk = "21.3.6528147"; - cmake = "3.10.2"; - emulator = "30.3.4"; + ndk = [ + "22.1.7171670" + "21.3.6528147" # LTS NDK + ]; + cmake = "3.18.1"; + emulator = "30.6.3"; }; platforms = ["23" "24" "25" "26" "27" "28" "29" "30"]; @@ -69,7 +69,7 @@ let emulatorVersion = android.versions.emulator; includeNDK = true; - ndkVersion = android.versions.ndk; + ndkVersions = android.versions.ndk; cmakeVersions = [android.versions.cmake]; useGoogleAPIs = true; @@ -130,7 +130,7 @@ pkgs.mkShell rec { shellHook = '' # Add cmake to the path. - cmake_root="$(echo "$ANDROID_SDK_ROOT/cmake/${android.versions.cmake}".*/)" + cmake_root="$(echo "$ANDROID_SDK_ROOT/cmake/${android.versions.cmake}"*/)" export PATH="$cmake_root/bin:$PATH" # Write out local.properties for Android Studio. |