From a1ac54e2679f77f09f69c5cd06acabc466cd4551 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Mon, 3 Mar 2025 23:58:23 +0100
Subject: [PATCH] saxon: use makeWrapper to create mainProgram and additional
 binaries

---
 .../libraries/java/saxon/default.nix          | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix
index e7d5cd8798a9..4d38f9a188b7 100644
--- a/pkgs/development/libraries/java/saxon/default.nix
+++ b/pkgs/development/libraries/java/saxon/default.nix
@@ -7,6 +7,7 @@
   jre8,
   genericUpdater,
   writeShellScript,
+  makeWrapper,
   common-updater-scripts,
   gnused,
 }:
@@ -36,22 +37,30 @@ let
       {
         inherit pname version src;
 
-        nativeBuildInputs = [ unzip ];
+        nativeBuildInputs = [
+          unzip
+          makeWrapper
+        ];
         dontUnpack = true;
 
-        installPhase = ''
-          unzip $src -d $out
-          mkdir -p $out/bin $out/share $out/share/java
-          cp -s "$out"/*.jar "$out/share/java/"  # */
-          rm -rf $out/notices
-          mv $out/doc $out/share
-          cat > $out/bin/${mainProgram} <<EOF
-          #! $shell
-          export JAVA_HOME=${jre}
-          exec ${jre}/bin/java -jar $out/${jar'}.jar "\$@"
-          EOF
-          chmod a+x $out/bin/${mainProgram}
-        '';
+        installPhase =
+          ''
+            unzip $src -d $out
+            mkdir -p $out/bin $out/share $out/share/java
+            cp -s "$out"/*.jar "$out/share/java/"  # */
+            rm -rf $out/notices
+            mv $out/doc $out/share
+
+            makeWrapper ${lib.getExe jre} $out/bin/${mainProgram} \
+              --add-flags "-jar $out/${jar'}.jar"
+          ''
+          + lib.optionalString (versionAtLeast finalAttrs.version "8") ''
+            makeWrapper ${lib.getExe jre} $out/bin/transform \
+              --add-flags "-cp $out/${jar'}.jar net.sf.saxon.Transform"
+
+            makeWrapper ${lib.getExe jre} $out/bin/query \
+              --add-flags "-cp $out/${jar'}.jar net.sf.saxon.Query"
+          '';
 
         passthru = lib.optionalAttrs (updateScript != null) {
           inherit updateScript;