diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2021-03-26 12:10:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 12:10:41 +0000 |
| commit | 3bb8ed60d057be78d7b2a515312a30c5ca1bffa9 (patch) | |
| tree | 360b46757874ad326c096eb85fabcac2b70ff6f6 /pkgs/servers | |
| parent | 36f2c10ca51ebb44d7494ee20c73648c644859c7 (diff) | |
| parent | 496873260ad5720a9a480671e2c70f8b2d9b52af (diff) | |
Merge pull request #117585 from petabyteboy/feature/nginx-geoip-optional
nginx: make geoip dependency optional
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/nginx/generic.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 251f099f7d96..d249d47a2150 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt + , nixosTests , substituteAll, gd, geoip, perl , withDebug ? false @@ -55,7 +56,6 @@ stdenv.mkDerivation { "--with-http_realip_module" "--with-http_addition_module" "--with-http_xslt_module" - "--with-http_geoip_module" "--with-http_sub_module" "--with-http_dav_module" "--with-http_flv_module" @@ -81,7 +81,6 @@ stdenv.mkDerivation { "--with-debug" ] ++ optionals withStream [ "--with-stream" - "--with-stream_geoip_module" "--with-stream_realip_module" "--with-stream_ssl_module" "--with-stream_ssl_preread_module" @@ -94,6 +93,8 @@ stdenv.mkDerivation { "--with-perl_modules_path=lib/perl5" ] ++ optional (gd != null) "--with-http_image_filter_module" + ++ optional (geoip != null) "--with-http_geoip_module" + ++ optional (withStream && geoip != null) "--with-stream_geoip_module" ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ configureFlags ++ map (mod: "--add-module=${mod.src}") modules; |