From 2b10f117913a1314f152f479193cb4bb065965b4 Mon Sep 17 00:00:00 2001 From: Marc Bornand Date: Sun, 17 Aug 2025 23:20:26 +0200 Subject: [PATCH] saxon: add -xslt symlink Some projects that expect to be built on debian/ubuntu search for saxon-xslt instead of saxon. --- pkgs/by-name/da/darktable/package.nix | 14 +------------- pkgs/development/libraries/java/saxon/default.nix | 4 ++++ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index c16b1712b958..ebd9a93d58c1 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - runCommand, # nativeBuildInputs cmake, @@ -80,17 +79,6 @@ gitUpdater, }: -let - # Create a wrapper for saxon to provide saxon-xslt command - saxon-xslt = runCommand "saxon-xslt" { } '' - mkdir -p $out/bin - cat > $out/bin/saxon-xslt << 'EOF' - #!/bin/sh - exec ${saxon}/bin/saxon "$@" - EOF - chmod +x $out/bin/saxon-xslt - ''; -in stdenv.mkDerivation rec { version = "5.2.1"; pname = "darktable"; @@ -109,7 +97,7 @@ stdenv.mkDerivation rec { perl pkg-config wrapGAppsHook3 - saxon-xslt # Use Saxon instead of libxslt to fix XSLT generate-id() consistency issues + saxon # Use Saxon instead of libxslt to fix XSLT generate-id() consistency issues ]; buildInputs = [ diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 60f8d574eed4..0892bd2ddc7a 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -53,6 +53,10 @@ let mkdir -p $out/bin makeWrapper ${lib.getExe jre} $out/bin/${mainProgram} \ --add-flags "-jar $out/share/java/${jar'}.jar" + + # Other distributions like debian distribute it as saxon*-xslt, + # this makes compilling packages that target other distros easier. + ln -s $out/bin/${mainProgram} $out/bin/${mainProgram}-xslt '' + lib.optionalString (versionAtLeast finalAttrs.version "11") '' mv lib $out/share/java