diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 464776569cb..1677376230b 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "saxon-6.5.3"; @@ -8,8 +8,13 @@ stdenv.mkDerivation { md5 = "7b8c7c187473c04d2abdb40d8ddab5c6"; }; - inherit unzip; - buildInputs = [unzip]; + nativeBuildInputs = [ unzip ]; + + # still leaving in root as well, in case someone is relying on that + preFixup = '' + mkdir -p "$out/share/java" + cp -s "$out"/*.jar "$out/share/java/" + ''; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/java/saxon/unzip-builder.sh b/pkgs/development/libraries/java/saxon/unzip-builder.sh index 48b3d4509d0..8ac35568f0b 100755 --- a/pkgs/development/libraries/java/saxon/unzip-builder.sh +++ b/pkgs/development/libraries/java/saxon/unzip-builder.sh @@ -1,3 +1,6 @@ source $stdenv/setup unzip $src -d $out + +fixupPhase + diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 423db6e71ff..53b3bbdaba4 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ jdk ant saxon ]; - preBuild = "CLASSPATH='${saxon}/saxon.jar'; echo CLASSPATH=$CLASSPATH; ant"; + preBuild = "ant"; installPhase = '' mkdir -p "$out"/{share/java,bin}