diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index bfd11d3ae64e..78d8e6218267 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + runCommand, # nativeBuildInputs cmake, @@ -12,6 +13,7 @@ perl, pkg-config, wrapGAppsHook3, + saxon, # buildInputs SDL2, @@ -52,7 +54,6 @@ libtiff, libwebp, libxml2, - libxslt, lua, util-linux, openexr, @@ -79,6 +80,17 @@ 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.0"; pname = "darktable"; @@ -97,6 +109,7 @@ stdenv.mkDerivation rec { perl pkg-config wrapGAppsHook3 + saxon-xslt # Use Saxon instead of libxslt to fix XSLT generate-id() consistency issues ]; buildInputs = @@ -120,7 +133,7 @@ stdenv.mkDerivation rec { lensfun lerc libaom - libavif + #libavif # TODO re-enable once cmake files are fixed (#425306) libdatrie libepoxy libexif @@ -138,7 +151,6 @@ stdenv.mkDerivation rec { libtiff libwebp libxml2 - libxslt lua openexr openjpeg