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/development/libraries/apr-util/default.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/development/libraries/apr-util/default.nix')
-rw-r--r-- | pkgs/development/libraries/apr-util/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 6f0956f1d1d1..8df7be4a7d1a 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { buildInputs = optional stdenv.isFreeBSD autoreconfHook; - configureFlags = [ "--with-apr=${apr}" "--with-expat=${expat}" ] + configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] ++ optional (!stdenv.isCygwin) "--with-crypto" - ++ optional sslSupport "--with-openssl=${openssl}" + ++ optional sslSupport "--with-openssl=${openssl.dev}" ++ optional bdbSupport "--with-berkeley-db=${db}" ++ optional ldapSupport "--with-ldap=ldap" ++ optionals stdenv.isCygwin |