diff options
| author | Albin <albin@mullvad.net> | 2026-04-24 09:39:00 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2026-04-24 09:39:00 +0200 |
| commit | 784d0590395c91b7b131c32ce9e475e2ca02150f (patch) | |
| tree | dcf09d811320cc1db86e84775c93a45c77f4bbf7 /nix/android-toolchain.nix | |
| parent | e68ffb15280f0ed93cc447da83ee9ee615fb3b21 (diff) | |
| parent | 0eaf4f1ae068c583990c882ed0b0d5e632fb79f3 (diff) | |
| download | mullvadvpn-main.tar.xz mullvadvpn-main.zip | |
Merge branch 'drop-jdk-17-from-devshell'main
Diffstat (limited to 'nix/android-toolchain.nix')
| -rw-r--r-- | nix/android-toolchain.nix | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/nix/android-toolchain.nix b/nix/android-toolchain.nix index b1b19551c1..8dfdc71141 100644 --- a/nix/android-toolchain.nix +++ b/nix/android-toolchain.nix @@ -2,7 +2,6 @@ pkgs, nixpkgs, android-nixpkgs, - system, common-toolchain, }: let @@ -22,16 +21,23 @@ let buildToolsVersion = versions."build-tools"; minSdkVersion = versions."min-sdk"; ndkVersion = versions.ndk; + jdk = pkgs."jdk${versions."jvm-toolchain"}"; - android-sdk = android-nixpkgs.sdk.${system} ( - sdkPkgs: with sdkPkgs; [ - (builtins.getAttr "platforms-android-${compileSdkVersion}-${compileSdkMinorVersion}" sdkPkgs) - (builtins.getAttr "build-tools-${builtins.replaceStrings [ "." ] [ "-" ] buildToolsVersion}" sdkPkgs) - (builtins.getAttr "ndk-${builtins.replaceStrings [ "." ] [ "-" ] ndkVersion}" sdkPkgs) - cmdline-tools-latest - platform-tools - ] - ); + android-sdk = + (import "${android-nixpkgs}" { + pkgs = pkgs // { + openjdk = jdk; + }; + }).sdk + ( + sdkPkgs: with sdkPkgs; [ + (builtins.getAttr "platforms-android-${compileSdkVersion}-${compileSdkMinorVersion}" sdkPkgs) + (builtins.getAttr "build-tools-${builtins.replaceStrings [ "." ] [ "-" ] buildToolsVersion}" sdkPkgs) + (builtins.getAttr "ndk-${builtins.replaceStrings [ "." ] [ "-" ] ndkVersion}" sdkPkgs) + cmdline-tools-latest + platform-tools + ] + ); rust-toolchain = common-toolchain.rust-toolchain-base.override { extensions = [ "rust-analyzer" ]; @@ -47,6 +53,7 @@ in inherit android-sdk rust-toolchain + jdk buildToolsVersion ndkVersion minSdkVersion @@ -58,7 +65,7 @@ in android-sdk rust-toolchain pkgs.protoc-gen-grpc-java - pkgs.jdk17 + jdk pkgs.python314 ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; |