summaryrefslogtreecommitdiffhomepage
path: root/nix/android-env.nix
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2026-04-24 09:39:00 +0200
committerAlbin <albin@mullvad.net>2026-04-24 09:39:00 +0200
commit784d0590395c91b7b131c32ce9e475e2ca02150f (patch)
treedcf09d811320cc1db86e84775c93a45c77f4bbf7 /nix/android-env.nix
parente68ffb15280f0ed93cc447da83ee9ee615fb3b21 (diff)
parent0eaf4f1ae068c583990c882ed0b0d5e632fb79f3 (diff)
downloadmullvadvpn-main.tar.xz
mullvadvpn-main.zip
Merge branch 'drop-jdk-17-from-devshell'main
Diffstat (limited to 'nix/android-env.nix')
-rw-r--r--nix/android-env.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nix/android-env.nix b/nix/android-env.nix
index 470b226189..5ba718f594 100644
--- a/nix/android-env.nix
+++ b/nix/android-env.nix
@@ -1,6 +1,7 @@
{
pkgs,
android-sdk,
+ jdk,
buildToolsVersion,
ndkVersion,
minSdkVersion,
@@ -19,7 +20,7 @@ in
[
{
name = "JAVA_HOME";
- value = "${pkgs.jdk17}";
+ value = "${jdk}";
}
{
name = "PROTOC_GEN_GRPC_JAVA_PLUGIN";