Fixing the builds of apr, apache, subversion and friends when having enabled the ldap support.

svn path=/nixpkgs/trunk/; revision=26764
This commit is contained in:
Lluís Batlle i Rossell 2011-04-09 14:59:06 +00:00
parent 450ef3730c
commit ccd2316471
2 changed files with 2 additions and 3 deletions

View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
${if ldapSupport then "--with-ldap" else ""}
'';
buildInputs = if ldapSupport then [ openldap ] else [];
propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap;
passthru = {
inherit bdbSupport;

View File

@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [perl apr aprutil pcre] ++
stdenv.lib.optional sslSupport openssl ++
stdenv.lib.optional ldapSupport openldap;
stdenv.lib.optional sslSupport openssl;
# An apr-util header file includes an apr header file
# through #include "" (quotes)