diff options
| author | Austin Seipp <aseipp@pobox.com> | 2014-05-17 14:48:27 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2014-05-17 14:48:27 -0500 |
| commit | 008dc39ca3117d837e5eb8c099386a55d912fd32 (patch) | |
| tree | 5fe74d7a980f07f0edb4e3f77d0ed9647507da20 /pkgs/servers/http | |
| parent | 5db4d83c129ac82bad6734ad8488547ffe317599 (diff) | |
| parent | 622aa834b72d4e8c10b8d61baec60706af26f170 (diff) | |
| download | nixlib-008dc39ca3117d837e5eb8c099386a55d912fd32.tar nixlib-008dc39ca3117d837e5eb8c099386a55d912fd32.tar.gz nixlib-008dc39ca3117d837e5eb8c099386a55d912fd32.tar.bz2 nixlib-008dc39ca3117d837e5eb8c099386a55d912fd32.tar.lz nixlib-008dc39ca3117d837e5eb8c099386a55d912fd32.tar.xz nixlib-008dc39ca3117d837e5eb8c099386a55d912fd32.tar.zst nixlib-008dc39ca3117d837e5eb8c099386a55d912fd32.zip | |
Merge pull request #2518 from jwiegley/nginx
Add -Wno-error=deprecated-declarations for nginx, required to build on Darwin
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/nginx/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index e8923559c033..32d4634e7fb9 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -74,8 +74,10 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional syslog "--add-module=${syslog-ext}" ++ stdenv.lib.optional moreheaders "--add-module=${moreheaders-ext}"; + additionalFlags = stdenv.lib.optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations"; + preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" ''; postInstall = '' |