diff options
| author | Will Dietz <w@wdtz.org> | 2018-01-03 08:18:48 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-01-03 08:49:48 -0600 |
| commit | 96f0d3b9084bd1949f9b2b79e11ee7ee35bac084 (patch) | |
| tree | dce0ae68d3287de41741323267b716f654340816 /pkgs/development/libraries/ncurses | |
| parent | 1531fd7351f6d0767a64816963fd82c31833788d (diff) | |
| download | nixlib-96f0d3b9084bd1949f9b2b79e11ee7ee35bac084.tar nixlib-96f0d3b9084bd1949f9b2b79e11ee7ee35bac084.tar.gz nixlib-96f0d3b9084bd1949f9b2b79e11ee7ee35bac084.tar.bz2 nixlib-96f0d3b9084bd1949f9b2b79e11ee7ee35bac084.tar.lz nixlib-96f0d3b9084bd1949f9b2b79e11ee7ee35bac084.tar.xz nixlib-96f0d3b9084bd1949f9b2b79e11ee7ee35bac084.tar.zst nixlib-96f0d3b9084bd1949f9b2b79e11ee7ee35bac084.zip | |
ncurses: simplify patch expr, fix ncurses6 build w/clang
Somewhat amusingly given its name, "clang.patch" applies to both 5 and 6
but is the cause of ncurses6 breakage on 6 but is required on 5...
gcc is happy in all four configurations:
5 5p 6 6p
gcc ✓ ✓ ✓ ✓
clang ✗ ✓ ✓ ✗
Which is why this commit enables the patch for 5 but not 6;
this matches behavior in Gentoo, for example.
For further simplification, we also use gcc-5 patch regardless.
Diffstat (limited to 'pkgs/development/libraries/ncurses')
| -rw-r--r-- | pkgs/development/libraries/ncurses/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 79414f016d39..ae875faddd72 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92"; }); - patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch; + patches = lib.optionals (abiVersion == "5") [ ./clang.patch ./gcc-5.patch ]; outputs = [ "out" "dev" "man" ]; setOutputFlags = false; # some aren't supported |