JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33376 from dtzWill/fix/ncurses6-clang

Browse Source 
ncurses: fix ncurses6 build w/clang
This commit is contained in:
Daiderd Jordan 2018-01-03 19:33:51 +01:00 committed by GitHub
commit c16e8b21b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/ncurses/default.nix
View File

@ -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