diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index c59184007e53..fc417b2b58af 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, apr, expat , bdbSupport ? false, db4 ? null +, ldapSupport ? true, openldap }: assert bdbSupport -> db4 != null; @@ -15,10 +16,14 @@ stdenv.mkDerivation rec { configureFlags = '' --with-apr=${apr} --with-expat=${expat} ${if bdbSupport then "--with-berkeley-db=${db4}" else ""} + ${if ldapSupport then "--with-ldap" else ""} ''; + + buildInputs = if ldapSupport then [ openldap ] else []; passthru = { inherit bdbSupport; + inherit ldapSupport; }; meta = { diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix index ab3f62331851..73dd676e3fba 100644 --- a/pkgs/servers/http/apache-httpd/default.nix +++ b/pkgs/servers/http/apache-httpd/default.nix @@ -1,9 +1,11 @@ { stdenv, fetchurl, openssl, perl, zlib , sslSupport, proxySupport ? true , apr, aprutil, pcre +, ldapSupport ? true, openldap }: assert sslSupport -> openssl != null; +assert ldapSupport -> aprutil.ldapSupport && openldap != null; stdenv.mkDerivation rec { version = "2.2.17"; @@ -15,7 +17,8 @@ stdenv.mkDerivation rec { }; buildInputs = [perl apr aprutil pcre] ++ - stdenv.lib.optional sslSupport openssl; + stdenv.lib.optional sslSupport openssl ++ + stdenv.lib.optional ldapSupport openldap; # An apr-util header file includes an apr header file # through #include "" (quotes) @@ -29,6 +32,7 @@ stdenv.mkDerivation rec { --enable-authn-alias ${if proxySupport then "--enable-proxy" else ""} ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""} + ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""} ''; postInstall = ''