From ccd2316471b0e99e1c9e5cc12e5484054a235a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 9 Apr 2011 14:59:06 +0000 Subject: [PATCH] Fixing the builds of apr, apache, subversion and friends when having enabled the ldap support. svn path=/nixpkgs/trunk/; revision=26764 --- pkgs/development/libraries/apr-util/default.nix | 2 +- pkgs/servers/http/apache-httpd/default.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index fc417b2b58a..dfaa340dcf9 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -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; diff --git a/pkgs/servers/http/apache-httpd/default.nix b/pkgs/servers/http/apache-httpd/default.nix index 73dd676e3fb..fd01be65e5d 100644 --- a/pkgs/servers/http/apache-httpd/default.nix +++ b/pkgs/servers/http/apache-httpd/default.nix @@ -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)