diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-17 12:20:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-17 12:20:00 +0000 |
| commit | f68cf6f574533f43813f7892940b127ed4f4ac40 (patch) | |
| tree | 1466bc477ac4ab5ab5f05afa67f451792e7ac69f /pkgs/tools/typesetting | |
| parent | 3ed237717a89c5aaf617ce3ae23a2876c7f36de8 (diff) | |
| parent | 894829379c5bb7458491a5c9bec019cad79a155f (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/fop/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index a572ce216ee6c..1c5e7b0079df3 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -2,22 +2,25 @@ stdenv.mkDerivation rec { pname = "fop"; - version = "2.1"; + version = "2.6"; src = fetchurl { url = "mirror://apache/xmlgraphics/fop/source/${pname}-${version}-src.tar.gz"; - sha256 = "165rx13q47l6qc29ppr7sg1z26vw830s3rkklj5ap7wgvy0ivbz5"; + sha256 = "145qph3c0m4bmb342qxq1hwsg594lndmfs9ga1v7pk53s34sckq8"; }; buildInputs = [ ant jdk ]; - buildPhase = "ant"; + # build only the "package" target, which generates the fop command. + buildPhase = '' + export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8" + ant -f fop/build.xml package + ''; installPhase = '' 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 fop/build/*.jar fop/lib/*.jar $out/lib/ + cp -r README fop/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. |