diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-29 21:28:43 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-29 21:34:24 -0400 |
| commit | 74c784a79c6908c14c0c13d6c34db93d9a4d2c8d (patch) | |
| tree | 1c1fce1416da69c98964f4495d47dcff30ed171b /pkgs/applications/science | |
| parent | 84a15876a3a9f92b6ba53a7ac18a7fd96f405bf9 (diff) | |
| download | nixlib-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.tar nixlib-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.tar.gz nixlib-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.tar.bz2 nixlib-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.tar.lz nixlib-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.tar.xz nixlib-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.tar.zst nixlib-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.zip | |
treewide: make -Wno-error flags clang-only
In 724e833ea2a, I was a little too aggressive in enabling these flags. Many don’t work in gcc, and we should probably avoid settings them widely. This makes those flags optional on isclang
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/astronomy/xplanet/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/science/biology/cmtk/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index aae9adfed67a..5f02dc27a224 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./gcc6.patch ]; - NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { description = "Renders an image of the earth or other planets into the X root window"; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 90766645ecb3..56de61da1c5a 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [cmake]; - NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with stdenv.lib; { description = "Computational Morphometry Toolkit "; |