Author: viric
Date: Sat Apr 9 14:59:06 2011
New Revision: 26764
URL: https://svn.nixos.org/websvn/nix/?rev=26764&sc=1
Log:
Fixing the builds of apr, apache, subversion and friends when having enabled
the ldap support.
Modified:
nixpkgs/trunk/pkgs/development/libraries/apr-util/default.nix
nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/apr-util/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/apr-util/default.nix Sat Apr
9 14:24:25 2011 (r26763)
+++ nixpkgs/trunk/pkgs/development/libraries/apr-util/default.nix Sat Apr
9 14:59:06 2011 (r26764)
@@ -19,7 +19,7 @@
${if ldapSupport then "--with-ldap" else ""}
'';
- buildInputs = if ldapSupport then [ openldap ] else [];
+ propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap;
passthru = {
inherit bdbSupport;
Modified: nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nix Sat Apr 9
14:24:25 2011 (r26763)
+++ nixpkgs/trunk/pkgs/servers/http/apache-httpd/default.nix Sat Apr 9
14:59:06 2011 (r26764)
@@ -17,8 +17,7 @@
};
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)
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
