diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-08-03 17:49:01 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-03 17:49:01 -0400 |
commit | 7a337cde318020a0f91702bfefee85a7b31be06f (patch) | |
tree | c49f254cfc7923c8f60b589449ea0dc11e1fa694 /pkgs/servers/http | |
parent | 8c784998f64da2d4c388f40a03f6604c8a2e0b45 (diff) | |
parent | 3e034bac1ae1db6ded4eaae0de5153302e683ca5 (diff) | |
download | nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.gz nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.bz2 nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.lz nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.xz nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.tar.zst nixlib-7a337cde318020a0f91702bfefee85a7b31be06f.zip |
Merge pull request #44423 from obsidiansystems/configureFlags-cleanup
treewide: All configureFlags are lists
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 46 | ||||
-rw-r--r-- | pkgs/servers/http/apache-modules/tomcat-connectors/default.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/http/couchdb/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/http/pshs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/yaws/default.nix | 2 |
5 files changed, 35 insertions, 26 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 4822b5109e81..d7f7660bf61f 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -47,26 +47,32 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --includedir=$dev/include" ''; - configureFlags = '' - --with-apr=${apr.dev} - --with-apr-util=${aprutil.dev} - --with-z=${zlib.dev} - --with-pcre=${pcre.dev} - --disable-maintainer-mode - --disable-debugger-mode - --enable-mods-shared=all - --enable-mpms-shared=all - --enable-cern-meta - --enable-imagemap - --enable-cgi - ${optionalString brotliSupport "--enable-brotli --with-brotli=${brotli}"} - ${optionalString proxySupport "--enable-proxy"} - ${optionalString sslSupport "--enable-ssl"} - ${optionalString http2Support "--enable-http2 --with-nghttp2"} - ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} - ${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"} - --docdir=$(doc)/share/doc - ''; + configureFlags = [ + "--with-apr=${apr.dev}" + "--with-apr-util=${aprutil.dev}" + "--with-z=${zlib.dev}" + "--with-pcre=${pcre.dev}" + "--disable-maintainer-mode" + "--disable-debugger-mode" + "--enable-mods-shared=all" + "--enable-mpms-shared=all" + "--enable-cern-meta" + "--enable-imagemap" + "--enable-cgi" + (stdenv.lib.enableFeature proxySupport "proxy") + (stdenv.lib.enableFeature sslSupport "ssl") + (stdenv.lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") + "--docdir=$(doc)/share/doc" + + (stdenv.lib.enableFeature brotliSupport "brotli") + (stdenv.lib.withFeatureAs brotliSupport "brotli" brotli) + + (stdenv.lib.enableFeature http2Support "http2") + (stdenv.lib.withFeature http2Support "nghttp2") + + (stdenv.lib.enableFeature luaSupport "lua") + (stdenv.lib.withFeatureAs luaSupport "lua" lua5) + ]; enableParallelBuilding = true; diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 58ae8f85b81f..e569ae8f8706 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc"; }; - configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}"; + configureFlags = [ + "--with-apxs=${apacheHttpd.dev}/bin/apxs" + "--with-java-home=${jdk}" + ]; setSourceRoot = '' sourceRoot=$(echo */native) diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 5a873c7e84b1..5239c027b8fa 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { If you wish to ignore this error pass --enable-js-trunk to ./configure. */ - configureFlags = '' - --enable-js-trunk - ''; + configureFlags = [ + "--enable-js-trunk" + ]; meta = with stdenv.lib; { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index 2205c91789f5..c38ca046a35b 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libevent file qrencode miniupnpc ]; # SSL requires libevent at 2.1 with ssl support - configureFlags = "--disable-ssl"; + configureFlags = [ "--disable-ssl" ]; meta = { description = "Pretty small HTTP server - a command-line tool to share files"; diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 5f92fbf2c03f..827f6122b573 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cd $name ''; - configureFlags = "--with-extrainclude=${pam}/include/security"; + configureFlags = [ "--with-extrainclude=${pam}/include/security" ]; buildInputs = [ erlang pam perl ]; |