diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 22:33:17 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 22:33:17 +0200 |
| commit | 4b929acf6739c1a60616f2a1edaf513b8e3dcc84 (patch) | |
| tree | f25103b54e5edbcface07e28fe999101b7872d97 /pkgs/servers/http | |
| parent | 7e912475961c791737f545eeaa3b898b1224a94b (diff) | |
| parent | ee1b8e4c7b9134dd8ae18d3476dff1691de20d0f (diff) | |
| download | nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.gz nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.bz2 nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.lz nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.xz nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.tar.zst nixpkgs-4b929acf6739c1a60616f2a1edaf513b8e3dcc84.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/nginx/generic.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index e74d2f84d62..3edbed22b6b 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -70,7 +70,10 @@ stdenv.mkDerivation { ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; - NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = [ + "-I${libxml2.dev}/include/libxml2" + "-Wno-error=implicit-fallthrough" + ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; configurePlatforms = []; |