diff options
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/apache-httpd/2.2.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/http/apache-modules/tomcat-connectors/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index 361aa3d58f75..0bde9baa4bf2 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --includedir=$dev/include" ''; configureFlags = '' - --with-z=${zlib} - --with-pcre=${pcre} + --with-z=${zlib.dev} + --with-pcre=${pcre.dev} --enable-mods-shared=all --enable-authn-alias ${if proxySupport then "--enable-proxy" else ""} - ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""} + ${if sslSupport then "--enable-ssl --with-ssl=${openssl.dev}" else ""} ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""} --with-mpm=${mpm} --enable-cache diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index bc7fd1441c13..d52973ea12f1 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -46,10 +46,10 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --includedir=$dev/include" ''; configureFlags = '' - --with-apr=${apr} - --with-apr-util=${aprutil} - --with-z=${zlib} - --with-pcre=${pcre} + --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 diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 90d0fb899c31..dee2fb3e4ff7 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "11khipjpy3y84j1pp7yyx76y64jccvyhh3klwzqxylff49vjc2fc"; }; - configureFlags = "--with-apxs=${apacheHttpd}/bin/apxs --with-java-home=${jdk}"; + configureFlags = "--with-apxs=${apacheHttpd.dev}/bin/apxs --with-java-home=${jdk}"; sourceRoot = "${name}-src/native"; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f58479e44782..888efc006d0f 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -55,7 +55,7 @@ src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity"; inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil}/include/apr-1 -I${pkgs.apacheHttpd}/include -I${pkgs.apr}/include/apr-1 -I${pkgs.yajl}/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil.dev}/include/apr-1 -I${pkgs.apacheHttpd.dev}/include -I${pkgs.apr.dev}/include/apr-1 -I${pkgs.yajl}/include" ''; }; |