From 8491821091195f710f5bb476f0d55cbae8ae9a79 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Tue, 12 Nov 2024 10:08:31 -0800 Subject: [PATCH] gradle: setup hook respects java override Before this commit, an expression like `pkgs.gradle_8.override { java = pkgs.openjdk17; }` would produce a gradle package which uses jdk 17, but has a setup hook which uses jdk 21. --- pkgs/development/tools/build-managers/gradle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 05dae5e6a5d9..d4247b7a1329 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -307,7 +307,7 @@ let ''; }; }; - passthru.jdk = defaultJava; + passthru.jdk = java; passthru.wrapped = callPackage wrapGradle { gradle-unwrapped = mkGradle genArgs; };