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

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;

pkgs/development/libraries/java/saxon/unzip-builder.sh

@@ -1,3 +1,6 @@
 source $stdenv/setup
 
 unzip $src -d $out
+
+fixupPhase
+

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}