mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
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:
parent
450ef3730c
commit
ccd2316471
@ -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;
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user