From aa112238de828de98ac8de59b3f3655e99ca63c6 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 17 Jan 2025 08:21:59 +0100 Subject: [PATCH] gradle: fix cross builds --- pkgs/development/tools/build-managers/gradle/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index ea87dd8e7a3f..ec90ac8e0263 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -48,6 +48,7 @@ rec { runCommand, writeText, autoPatchelfHook, + buildPackages, # The JDK/JRE used for running Gradle. java ? defaultJava, @@ -78,7 +79,6 @@ rec { ]; buildInputs = [ - java stdenv.cc.cc ncurses5 ncurses6 @@ -121,6 +121,8 @@ rec { newFileEvents = toString (lib.versionAtLeast version "8.12"); in '' + # get the correct jar executable for cross + export PATH="${buildPackages.jdk}/bin:$PATH" . ${./patching.sh} nativeVersion="$(extractVersion native-platform $out/lib/gradle/lib/native-platform-*.jar)"