diff options
Diffstat (limited to 'pkgs/tools/text/groff/default.nix')
| -rw-r--r-- | pkgs/tools/text/groff/default.nix | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index ae250f2efeea..df06292c4f3e 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -14,30 +14,16 @@ stdenv.mkDerivation rec { pname = "groff"; - version = "1.22.4"; + version = "1.23.0"; src = fetchurl { url = "mirror://gnu/groff/${pname}-${version}.tar.gz"; - sha256 = "14q2mldnr1vx0l9lqp9v2f6iww24gj28iyh4j2211hyynx67p3p7"; + hash = "sha256-a5dX9ZK3UYtJAutq9+VFcL3Mujeocf3bLTCuOGNRHBM="; }; outputs = [ "out" "man" "doc" "info" "perl" ]; - # Parallel build is failing for missing depends. Known upstream as: - # https://savannah.gnu.org/bugs/?62084 - # fixed, planned release: 1.23.0 - enableParallelBuilding = false; - - patches = [ - ./0001-Fix-cross-compilation-by-looking-for-ar.patch - ] - ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "9") [ - # https://trac.macports.org/ticket/59783 - (fetchpatch { - url = "https://raw.githubusercontent.com/openembedded/openembedded-core/ce265cf467f1c3e5ba2edbfbef2170df1a727a52/meta/recipes-extended/groff/files/0001-Include-config.h.patch"; - sha256 = "1b0mg31xkpxkzlx696nr08rcc7ndpaxdplvysy0hw5099c4n1wyf"; - }) - ]; + enableParallelBuilding = true; postPatch = '' # BASH_PROG gets replaced with a path to the build bash which doesn't get automatically patched by patchShebangs @@ -53,8 +39,7 @@ stdenv.mkDerivation rec { --replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \ --replace "pngtopnm" "${lib.getBin netpbm}/bin/pngtopnm" \ --replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage" - substituteInPlace contrib/groffer/roff2.pl \ - --replace "'gs'" "'${lib.getBin ghostscript}/bin/gs'" + '' + lib.optionalString (enableGhostscript || enableHtml) '' substituteInPlace contrib/pdfmark/pdfroff.sh \ --replace '$GROFF_GHOSTSCRIPT_INTERPRETER' "${lib.getBin ghostscript}/bin/gs" \ --replace '$GROFF_AWK_INTERPRETER' "${lib.getBin gawk}/bin/gawk" @@ -119,11 +104,6 @@ stdenv.mkDerivation rec { substituteInPlace $perl/bin/gpinyin \ --replace $out/lib/groff/gpinyin $perl/lib/groff/gpinyin - moveToOutput bin/groffer $perl - moveToOutput lib/groff/groffer $perl - substituteInPlace $perl/bin/groffer \ - --replace $out/lib/groff/groffer $perl/lib/groff/groffer - moveToOutput bin/grog $perl moveToOutput lib/groff/grog $perl substituteInPlace $perl/bin/grog \ |