diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-03 16:03:36 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-06 14:36:13 +0100 |
commit | 48701a3cefc756bbc9e76a3a3c9cf3ded1166eb8 (patch) | |
tree | f9da1ad1a5e460df76d67743cfbb2bacf574e213 /pkgs/tools | |
parent | 4728ec3f99579911d6d880807ec3b5b53b7ef0d5 (diff) | |
download | nixlib-48701a3cefc756bbc9e76a3a3c9cf3ded1166eb8.tar nixlib-48701a3cefc756bbc9e76a3a3c9cf3ded1166eb8.tar.gz nixlib-48701a3cefc756bbc9e76a3a3c9cf3ded1166eb8.tar.bz2 nixlib-48701a3cefc756bbc9e76a3a3c9cf3ded1166eb8.tar.lz nixlib-48701a3cefc756bbc9e76a3a3c9cf3ded1166eb8.tar.xz nixlib-48701a3cefc756bbc9e76a3a3c9cf3ded1166eb8.tar.zst nixlib-48701a3cefc756bbc9e76a3a3c9cf3ded1166eb8.zip |
fop: Drop runtime dependency on the JDK
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/typesetting/fop/default.nix | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index bc4486ed49cf..473b23fe2627 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -4,34 +4,28 @@ stdenv.mkDerivation rec { name = "fop-1.1"; src = fetchurl { - url = "http://apache.uib.no/xmlgraphics/fop/source/${name}-src.tar.gz"; + url = "mirror://apache/xmlgraphics/fop/source/${name}-src.tar.gz"; sha256 = "08i56d57w5dl5bqchr34x9165hvi5h4bhiflxhi0a4wd56rlq5jq"; }; buildInputs = [ ant jdk ]; - buildPhase = '' - ant - ''; + buildPhase = "ant"; installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/lib" - mkdir -p "$out/share/doc/fop" + mkdir -p $out/bin $out/lib $out/share/doc/fop - cp build/*.jar lib/*.jar "$out/lib/" - cp -r README examples/ "$out/share/doc/fop/" + cp build/*.jar lib/*.jar $out/lib/ + cp -r README examples/ $out/share/doc/fop/ # There is a fop script in the source archive, but it has many impurities. # Instead of patching out 90 % of the script, we write our own. cat > "$out/bin/fop" <<EOF #!${stdenv.shell} java_exec_args="-Djava.awt.headless=true" - # Note the wildcard; it will be passed to java and java will expand it - LOCALCLASSPATH="$out/lib/*" - exec "${jdk}/bin/java" \$java_exec_args -classpath "\$LOCALCLASSPATH" org.apache.fop.cli.Main "\$@" + exec ${jdk.jre}/bin/java \$java_exec_args -classpath "$out/lib/*" org.apache.fop.cli.Main "\$@" EOF - chmod a+x "$out/bin/fop" + chmod a+x $out/bin/fop ''; meta = with stdenv.lib; { |