public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/apr-util/default.nix
View File

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

3
pkgs/servers/http/apache-httpd/default.nix
View File

@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [perl apr aprutil pcre] ++ 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 # An apr-util header file includes an apr header file
# through #include "" (quotes) # through #include "" (quotes)