From bd244e7a4c391db5f065c2c5cbcc55b07b0cd290 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sat, 30 Dec 2023 14:45:12 +0200 Subject: [PATCH] gradle: also patch the native file-events library It depends on libstdc++, so add that to its RPATH. --- pkgs/development/tools/build-managers/gradle/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 23f12b1aa3d3..a9827e7a0a7e 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -111,6 +111,13 @@ rec { "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" done + # The file-events library _seems_ to follow the native-platform version, but + # we won’t assume that. + fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)" + autoPatchelfInJar \ + $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \ + "${stdenv.cc.cc.lib}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" + # The scanner doesn't pick up the runtime dependency in the jar. # Manually add a reference where it will be found. mkdir $out/nix-support