Merge pull request #62752 from matthewbauer/darwin-fixes100

Fixes for x86_64-darwin failures on Hydra
2019-06-06 09:46:41 -04:00
parent 1dc26c32ed 9a0ced7e45
commit d598eca41e
17 changed files with 29 additions and 46 deletions
--- a/pkgs/development/python-modules/cld2-cffi/default.nix
+++ b/pkgs/development/python-modules/cld2-cffi/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
  checkInputs = [ nose ];

  # gcc doesn't approve of this code, so disable -Werror
-  NIX_CFLAGS_COMPILE = "-w";
+  NIX_CFLAGS_COMPILE = [ "-w" ] ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing";

  checkPhase = "nosetests -v";