diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:37:04 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:58:40 +0200 |
commit | e4832c754114c5660909546ac749475bf63ff06e (patch) | |
tree | fe77400566603caa218453ad5c7b6b9b5ea9715c /pkgs/servers/http/apache-httpd/2.2.nix | |
parent | 60a890e35bc94ace092a2ec278534979fe6ee361 (diff) | |
parent | dc13593b9fad3ea3728e2fd32f90841d5ec7662d (diff) | |
download | nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.gz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.bz2 nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.lz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.xz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.zst nixlib-e4832c754114c5660909546ac749475bf63ff06e.zip |
Merge branch 'staging'
Includes a security update of libxml2.
Diffstat (limited to 'pkgs/servers/http/apache-httpd/2.2.nix')
-rw-r--r-- | pkgs/servers/http/apache-httpd/2.2.nix | 6 |
1 files changed, 3 insertions, 3 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 |