diff options
| author | Robin Gloster <mail@glob.in> | 2019-11-20 10:17:54 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 01:37:49 +0100 |
| commit | 6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e (patch) | |
| tree | f7e05e6509973953dedade1333c125ef65163fb2 /pkgs/servers/http | |
| parent | e9c27ed5f9494e1070ce4f1d5da14de1e9e072ac (diff) | |
| download | nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.tar nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.tar.gz nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.tar.bz2 nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.tar.lz nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.tar.xz nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.tar.zst nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.zip | |
treewide: configureFlags is a flat list
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/nginx/generic.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/http/tengine/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/http/unit/default.nix | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 2d1b994faab..990d7c5cf13 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -53,15 +53,15 @@ stdenv.mkDerivation { "--with-http_stub_status_module" "--with-threads" "--with-pcre-jit" - ] ++ optional withDebug [ + ] ++ optionals withDebug [ "--with-debug" - ] ++ optional withStream [ + ] ++ optionals withStream [ "--with-stream" "--with-stream_geoip_module" "--with-stream_realip_module" "--with-stream_ssl_module" "--with-stream_ssl_preread_module" - ] ++ optional withMail [ + ] ++ optionals withMail [ "--with-mail" "--with-mail_ssl_module" ] ++ optional (perl != null) [ diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 1467b1577f9..1eeb5a8c4dd 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -53,23 +53,23 @@ stdenv.mkDerivation rec { "--with-poll_module" "--with-google_perftools_module" "--with-jemalloc" - ] ++ optional withDebug [ + ] ++ optionals withDebug [ "--with-debug" - ] ++ optional withMail [ + ] ++ optionals withMail [ "--with-mail" "--with-mail_ssl_module" - ] ++ optional (!withMail) [ + ] ++ optionals (!withMail) [ "--without-mail_pop3_module" "--without-mail_imap_module" "--without-mail_smtp_module" - ] ++ optional withStream [ + ] ++ optionals withStream [ "--with-stream" "--with-stream_ssl_module" "--with-stream_realip_module" "--with-stream_geoip_module" "--with-stream_ssl_preread_module" "--with-stream_sni" - ] ++ optional (!withStream) [ + ] ++ optionals (!withStream) [ "--without-stream_limit_conn_module" "--without-stream_access_module" "--without-stream_geo_module" diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 8711be4b5c0..d68c37e02d9 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { "--pid=/run/unit/unit.pid" "--user=unit" "--group=unit" - ] ++ optional withSSL [ "--openssl" ] - ++ optional (!withIPv6) [ "--no-ipv6" ] - ++ optional withDebug [ "--debug" ]; + ] ++ optional withSSL "--openssl" + ++ optional (!withIPv6) "--no-ipv6" + ++ optional withDebug "--debug"; postConfigure = '' ${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"} |