diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-02-17 11:51:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-17 11:51:21 +0100 |
| commit | 1d83592c1d5b13f1dc0a3e9a611db19963b6aa2f (patch) | |
| tree | ac30408e147dd3659c671285c66cc239158d05a8 /pkgs | |
| parent | 26e3d267770025c8446e2583d84b32a3492503db (diff) | |
| parent | 7186383a6ba4b9af20c9e813c8a26bf17c9307f8 (diff) | |
| download | nixpkgs-1d83592c1d5b13f1dc0a3e9a611db19963b6aa2f.tar nixpkgs-1d83592c1d5b13f1dc0a3e9a611db19963b6aa2f.tar.gz nixpkgs-1d83592c1d5b13f1dc0a3e9a611db19963b6aa2f.tar.bz2 nixpkgs-1d83592c1d5b13f1dc0a3e9a611db19963b6aa2f.tar.lz nixpkgs-1d83592c1d5b13f1dc0a3e9a611db19963b6aa2f.tar.xz nixpkgs-1d83592c1d5b13f1dc0a3e9a611db19963b6aa2f.tar.zst nixpkgs-1d83592c1d5b13f1dc0a3e9a611db19963b6aa2f.zip | |
Merge pull request #113175 from cyraxjoe/update/fop
fop: 2.1 -> 2.6
Diffstat (limited to 'pkgs')
| -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 a572ce216ee..1c5e7b0079d 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. |