diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-09-09 08:09:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-09 08:09:36 +0200 |
| commit | 731c82a447d916e78f31642ad757a3ce8911f1ea (patch) | |
| tree | 8630c820679c3d3245267a4f701ae9a4a9cd3e3e /pkgs/tools/networking | |
| parent | 21f61dde0dcf436660224acdb7ee5bd6d72ee192 (diff) | |
| parent | b5284a56d9b2c0bace0e7d9acdb2003b47fe581e (diff) | |
Merge pull request #68244 from NixOS/staging-next
Staging next that includes gcc8
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/altermime/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/networking/dhcp/default.nix | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index a77fd56f673..e9091086ed9 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { "-Wno-error=format-truncation" "-Wno-error=pointer-compare" "-Wno-error=memset-elt-size" + "-Wno-error=restrict" ]; postPatch = '' diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index 24e23e6e0d3..bcf0743b7b9 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -39,7 +39,10 @@ stdenv.mkDerivation rec { (lib.optional stdenv.isLinux "--with-randomdev=/dev/random") ] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=pointer-compare" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=pointer-compare" + "-Wno-error=format-truncation" + ]; installFlags = [ "DESTDIR=\${out}" ]; |