gradle: add support for the new file-events library format

NixOS · Dec 27, 2024 · 27baadb · 27baadb
1 parent 22a8215
commit 27baadb
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -115,6 +115,7 @@ rec {
       fixupPhase =
         let
           arch = if stdenv.hostPlatform.is64bit then "amd64" else "i386";
+          newFileEvents = toString (lib.versionAtLeast version "8.12");
         in
         ''
           . ${./patching.sh}
@@ -134,10 +135,17 @@ rec {
 
           # 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 \
-            "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}"
+          if [ -n "${newFileEvents}" ]; then
+            fileEventsVersion="$(extractVersion gradle-fileevents $out/lib/gradle/lib/gradle-fileevents-*.jar)"
+            autoPatchelfInJar \
+              $out/lib/gradle/lib/gradle-fileevents-''${fileEventsVersion}.jar \
+              "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}"
+          else
+            fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)"
+            autoPatchelfInJar \
+              $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \
+              "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}"
+          fi
 
           # The scanner doesn't pick up the runtime dependency in the jar.
           # Manually add a reference where it will be found.