diff options
-rw-r--r-- | pkgs/development/libraries/java/saxon/default8.nix | 21 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 16 insertions, 7 deletions
diff --git a/pkgs/development/libraries/java/saxon/default8.nix b/pkgs/development/libraries/java/saxon/default8.nix index af5461d76f0..d9d2e68ce0a 100644 --- a/pkgs/development/libraries/java/saxon/default8.nix +++ b/pkgs/development/libraries/java/saxon/default8.nix @@ -1,13 +1,22 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, jre}: stdenv.mkDerivation { - name = "saxonb-8.0"; - builder = ./unzip-builder.sh; + name = "saxonb-8.8"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/saxonb8-0.zip; - md5 = "d05fbd398847ef27b2d1d875bb5136ea"; + url = http://mesh.dl.sourceforge.net/sourceforge/saxon/saxonb8-8j.zip; + md5 = "35c4c376174cfe340f179d2e44dd84f0"; }; - inherit unzip; buildInputs = [unzip]; + + buildCommand = " + unzip $src -d $out + ensureDir $out/bin + cat > $out/bin/saxon8 <<EOF +#! $shell +export JAVA_HOME=${jre} +exec ${jre}/bin/java -jar $out/saxon8.jar \"\\$@\" +EOF + chmod a+x $out/bin/saxon8 + "; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b54064a7257..fdcf7549150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1776,7 +1776,7 @@ rec { }; saxonb = import ../development/libraries/java/saxon/default8.nix { - inherit fetchurl stdenv unzip; + inherit fetchurl stdenv unzip jre; }; sharedobjects = import ../development/libraries/java/shared-objects { |