diff options
author | Andrew Childs <lorne@cons.org.nz> | 2020-11-19 16:37:54 +0900 |
---|---|---|
committer | Andrew Childs <lorne@cons.org.nz> | 2021-05-17 00:27:00 +0900 |
commit | 5ed7e55167aef1f1a856af8bcc597f896d572bbe (patch) | |
tree | acf40d922be0b2237439b046bf6890e3bede7dc4 /pkgs | |
parent | c9af80e44aa020e6a34469b74ab38dd134883d47 (diff) | |
download | nixpkgs-5ed7e55167aef1f1a856af8bcc597f896d572bbe.tar nixpkgs-5ed7e55167aef1f1a856af8bcc597f896d572bbe.tar.gz nixpkgs-5ed7e55167aef1f1a856af8bcc597f896d572bbe.tar.bz2 nixpkgs-5ed7e55167aef1f1a856af8bcc597f896d572bbe.tar.lz nixpkgs-5ed7e55167aef1f1a856af8bcc597f896d572bbe.tar.xz nixpkgs-5ed7e55167aef1f1a856af8bcc597f896d572bbe.tar.zst nixpkgs-5ed7e55167aef1f1a856af8bcc597f896d572bbe.zip |
groff: fix build with clang >= 9
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/text/groff/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 892aeb463f8..5b158f2cbb0 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl +{ lib, stdenv, fetchurl, fetchpatch, perl , ghostscript #for postscript and html output , psutils, netpbm #for html output , buildPackages @@ -22,6 +22,13 @@ stdenv.mkDerivation rec { 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"; + }) ]; postPatch = lib.optionalString (psutils != null) '' |