From 496873260ad5720a9a480671e2c70f8b2d9b52af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 25 Mar 2021 13:17:32 +0100 Subject: [PATCH] nginx: make geoip dependency optional --- pkgs/servers/http/nginx/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 251f099f7d9..d249d47a215 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;