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/tools | |
| parent | 84a15876a3a9f92b6ba53a7ac18a7fd96f405bf9 (diff) | |
| download | nixpkgs-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.tar nixpkgs-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.tar.gz nixpkgs-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.tar.bz2 nixpkgs-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.tar.lz nixpkgs-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.tar.xz nixpkgs-74c784a79c6908c14c0c13d6c34db93d9a4d2c8d.tar.zst nixpkgs-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/tools')
| -rw-r--r-- | pkgs/tools/archivers/p7zip/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/pbzip2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/ntopng/default.nix | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 3dac4245de4..3b212b186aa 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - NIX_CFLAGS_COMPILE = "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { homepage = http://p7zip.sourceforge.net/; diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index c7c1b7efc94..1d5cd85a62e 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=$(out)"; - NIX_CFLAGS_COMPILE = "-Wno-error=reserved-user-defined-literal"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; meta = with stdenv.lib; { homepage = http://compression.ca/pbzip2/; diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index b1e1bfcdd65..06d28e844ff 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -53,7 +53,8 @@ stdenv.mkDerivation rec { sed 's|LIBS += -lstdc++.6||' -i Makefile ''; - NIX_CFLAGS_COMPILE = [ "-fpermissive" "-Wno-error=reserved-user-defined-literal" ]; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ] + ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; meta = with stdenv.lib; { description = "High-speed web-based traffic analysis and flow collection tool"; |