diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 14:30:43 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-04 14:30:43 +0100 |
| commit | 7495c61d49208a9fc90b937bca548d9005ff17c8 (patch) | |
| tree | 5eec5f802d3146b8b1f788aa1275ea1c44a24d31 /pkgs/servers/http | |
| parent | ed867a50eb89a90db3b1741bf4c0bf0cd4557dba (diff) | |
| parent | 899d81b37ba6dc26431b82b40300505f19504e03 (diff) | |
| download | nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.gz nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.bz2 nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.lz nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.xz nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.tar.zst nixlib-7495c61d49208a9fc90b937bca548d9005ff17c8.zip | |
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts: pkgs/applications/editors/vim/macvim.nix
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/nginx/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index e5c9b9b9456f..1d2887bcc210 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"; - additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations"; + additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized"; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" |