Merge pull request #7577 from cheecheeo/curl_ldap_support_staging_squashed

curl: ldap and libidn support as `curlFull`
This commit is contained in:
William A. Kennington III 2015-04-25 23:40:31 -07:00
commit c1cc2348e4
2 changed files with 15 additions and 0 deletions

View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl
, idnSupport ? false, libidn ? null
, ldapSupport ? false, openldap ? null
, zlibSupport ? false, zlib ? null
, sslSupport ? false, openssl ? null
, scpSupport ? false, libssh2 ? null
@ -6,6 +8,8 @@
, c-aresSupport ? false, c-ares ? null
}:
assert idnSupport -> libidn != null;
assert ldapSupport -> openldap != null;
assert zlibSupport -> zlib != null;
assert sslSupport -> openssl != null;
assert scpSupport -> libssh2 != null;
@ -23,6 +27,8 @@ stdenv.mkDerivation rec {
# "-lz -lssl", which aren't necessary direct build inputs of
# applications that use Curl.
propagatedBuildInputs = with stdenv.lib;
optional idnSupport libidn ++
optional ldapSupport openldap ++
optional zlibSupport zlib ++
optional gssSupport gss ++
optional c-aresSupport c-ares ++
@ -43,6 +49,9 @@ stdenv.mkDerivation rec {
configureFlags = [
( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
( if ldapSupport then "--enable-ldap" else "--disable-ldap" )
( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" )
( if idnSupport then "--with-libidn=${libidn}" else "--without-libidn" )
]
++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}";

View file

@ -1050,6 +1050,12 @@ let
cudatoolkit = cudatoolkit5;
curlFull = curl.override {
idnSupport = true;
ldapSupport = true;
gssSupport = true;
};
curl = callPackage ../tools/networking/curl rec {
fetchurl = fetchurlBoot;
zlibSupport = true;