diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-03 19:33:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 19:33:51 +0100 |
| commit | c16e8b21b84dece004a8bec93e2c882df488a88c (patch) | |
| tree | 5df62427f1aa70be634fdece905207cb204e8d0a | |
| parent | bbb04db8feb54c99ac1c8d4e9c9352fcd053cd89 (diff) | |
| parent | 48a5212c15864dc8804133a53b28e43cb7a59050 (diff) | |
| download | nixlib-c16e8b21b84dece004a8bec93e2c882df488a88c.tar nixlib-c16e8b21b84dece004a8bec93e2c882df488a88c.tar.gz nixlib-c16e8b21b84dece004a8bec93e2c882df488a88c.tar.bz2 nixlib-c16e8b21b84dece004a8bec93e2c882df488a88c.tar.lz nixlib-c16e8b21b84dece004a8bec93e2c882df488a88c.tar.xz nixlib-c16e8b21b84dece004a8bec93e2c882df488a88c.tar.zst nixlib-c16e8b21b84dece004a8bec93e2c882df488a88c.zip | |
Merge pull request #33376 from dtzWill/fix/ncurses6-clang
ncurses: fix ncurses6 build w/clang
| -rw-r--r-- | pkgs/development/libraries/ncurses/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 79414f016d39..675756509c85 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92"; }); - patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch; + # Unnecessarily complicated in order to avoid mass-rebuilds + patches = lib.optional (!stdenv.cc.isClang || abiVersion == "5") ./clang.patch + ++ lib.optional (stdenv.cc.isGNU && abiVersion == "5") ./gcc-5.patch; outputs = [ "out" "dev" "man" ]; setOutputFlags = false; # some aren't supported |