Add nginx perl modules (#73198)

* nginx: enable perl_module if perl is given

* nginx: move `perl = null` to toplevel
This commit is contained in:
tekeri 2019-11-28 02:08:56 +09:00 committed by Michael Raskin
parent 177b1bcea1
commit a5f26644d4
2 changed files with 8 additions and 4 deletions

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
, substituteAll, gd, geoip
, substituteAll, gd, geoip, perl
, withDebug ? false
, withStream ? true
, withMail ? false
@ -29,7 +29,7 @@ stdenv.mkDerivation {
inherit sha256;
};
buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip ]
buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ]
++ mapModules "inputs";
configureFlags = [
@ -52,8 +52,6 @@ stdenv.mkDerivation {
"--with-http_stub_status_module"
"--with-threads"
"--with-pcre-jit"
# Install destination problems
# "--with-http_perl_module"
] ++ optional withDebug [
"--with-debug"
] ++ optional withStream [
@ -65,6 +63,10 @@ stdenv.mkDerivation {
] ++ optional withMail [
"--with-mail"
"--with-mail_ssl_module"
] ++ optional (perl != null) [
"--with-http_perl_module"
"--with-perl=${perl}/bin/perl"
"--with-perl_modules_path=lib/perl5"
]
++ optional (gd != null) "--with-http_image_filter_module"
++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"

View file

@ -15210,12 +15210,14 @@ in
nginx = nginxStable;
nginxStable = callPackage ../servers/http/nginx/stable.nix {
perl = null;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
};
nginxMainline = callPackage ../servers/http/nginx/mainline.nix {
perl = null;
# We don't use `with` statement here on purpose!
# See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
modules = [ nginxModules.dav nginxModules.moreheaders ];