diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 20:44:26 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 20:44:26 +0200 |
| commit | 5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3 (patch) | |
| tree | c999ad66361e4c4c5d3ad5443bf575422c41150d /pkgs/tools/security | |
| parent | ccc8c73ea00321318e9ac2cb75879f57bef328a7 (diff) | |
| parent | e7297363c95415aa2376130583d6c74a85714ab5 (diff) | |
| download | nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.gz nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.bz2 nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.lz nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.xz nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.zst nixlib-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.zip | |
Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/chaps/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix index 1270423e9285..e81567c3ed87 100644 --- a/pkgs/tools/security/chaps/default.nix +++ b/pkgs/tools/security/chaps/default.nix @@ -31,8 +31,12 @@ stdenv.mkDerivation rec { sha256 = "0chk6pnn365d5kcz6vfqx1d0383ksk97icc0lzg0vvb0kvyj0ff1"; }; - # readdir_r(3) is deprecated in glibc >= 2.24 - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = [ + # readdir_r(3) is deprecated in glibc >= 2.24 + "-Wno-error=deprecated-declarations" + # gcc8 catching polymorphic type error + "-Wno-error=catch-value" + ]; patches = [ ./fix_absolute_path.patch ./fix_environment_variables.patch ./fix_scons.patch ./insert_prefetches.patch ]; |