saxon: use our standard share/java/*.jar location

Changed files
+12 -4
pkgs
development
libraries
tools
text
xml
jing-trang
+8 -3
pkgs/development/libraries/java/saxon/default.nix
··· 1 - {stdenv, fetchurl, unzip}: 2 3 stdenv.mkDerivation { 4 name = "saxon-6.5.3"; ··· 8 md5 = "7b8c7c187473c04d2abdb40d8ddab5c6"; 9 }; 10 11 - inherit unzip; 12 - buildInputs = [unzip]; 13 14 meta = { 15 platforms = stdenv.lib.platforms.unix;
··· 1 + { stdenv, fetchurl, unzip }: 2 3 stdenv.mkDerivation { 4 name = "saxon-6.5.3"; ··· 8 md5 = "7b8c7c187473c04d2abdb40d8ddab5c6"; 9 }; 10 11 + nativeBuildInputs = [ unzip ]; 12 + 13 + # still leaving in root as well, in case someone is relying on that 14 + preFixup = '' 15 + mkdir -p "$out/share/java" 16 + cp -s "$out"/*.jar "$out/share/java/" 17 + ''; 18 19 meta = { 20 platforms = stdenv.lib.platforms.unix;
+3
pkgs/development/libraries/java/saxon/unzip-builder.sh
··· 1 source $stdenv/setup 2 3 unzip $src -d $out
··· 1 source $stdenv/setup 2 3 unzip $src -d $out 4 + 5 + fixupPhase 6 +
+1 -1
pkgs/tools/text/xml/jing-trang/default.nix
··· 13 14 buildInputs = [ jdk ant saxon ]; 15 16 - preBuild = "CLASSPATH='${saxon}/saxon.jar'; echo CLASSPATH=$CLASSPATH; ant"; 17 18 installPhase = '' 19 mkdir -p "$out"/{share/java,bin}
··· 13 14 buildInputs = [ jdk ant saxon ]; 15 16 + preBuild = "ant"; 17 18 installPhase = '' 19 mkdir -p "$out"/{share/java,bin}