curl: Modernize build

4 files changed, 121 insertions, 85 deletions

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 013aa12d9564..9cc5d4700878 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -92,11 +92,7 @@ rec {
     aclSupport = false;
   })).crossDrv;
   
-  curlMinimal = (pkgs.curl.override {
-    zlibSupport = false;
-    sslSupport = false;
-    scpSupport = false;
-  }).crossDrv;
+  curl-light = pkgs.curl-light.crossDrv;
   
   busyboxMinimal = (pkgs.busybox.override {
     # TBD: uClibc is broken.
@@ -170,8 +166,8 @@ rec {
         cp -d ${gnumake}/bin/* $out/bin
         cp -d ${patch}/bin/* $out/bin
         cp ${patchelf}/bin/* $out/bin
-        cp ${curlMinimal}/bin/curl $out/bin
-        cp -d ${curlMinimal}/lib/libcurl* $out/lib
+        cp ${curl-light}/bin/curl $out/bin
+        cp -d ${curl-light}/lib/libcurl* $out/lib
 
         cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep
         
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 3ad81476c2e9..f9943fc5f199 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -10,12 +10,6 @@ rec {
     aclSupport = false;
   });
 
-  curlMinimal = curl.override {
-    zlibSupport = false;
-    sslSupport = false;
-    scpSupport = false;
-  };
-
   busyboxMinimal = busybox.override {
     useUclibc = true;
     enableStatic = true;
@@ -83,8 +77,8 @@ rec {
         cp -d ${gnumake}/bin/* $out/bin
         cp -d ${patch}/bin/* $out/bin
         cp ${patchelf}/bin/* $out/bin
-        cp ${curlMinimal}/bin/curl $out/bin
-        cp -d ${curlMinimal}/lib/libcurl* $out/lib
+        cp ${curl-light}/bin/curl $out/bin
+        cp -d ${curl-light}/lib/libcurl* $out/lib
 
         cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
 
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 28f28c9a4f93..f8b3ad9355ad 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,81 +1,133 @@
-{ stdenv, fetchurl
-, idnSupport ? false, libidn ? null
-, ldapSupport ? false, openldap ? null
-, zlibSupport ? false, zlib ? null
-, sslSupport ? false, openssl ? null
-, scpSupport ? false, libssh2 ? null
-, gssSupport ? false, gss ? null
-, c-aresSupport ? false, c-ares ? null
+{ stdenv, fetchurl, pkgconfig
+
+# Optional Dependencies
+, zlib ? null, openssl ? null, libssh2 ? null, libnghttp2 ? null, c-ares ? null
+, gss ? null, rtmpdump ? null, openldap ? null, libidn ? null
+
+# Extra arguments
+, suffix ? ""
 }:
 
-assert idnSupport -> libidn != null;
-assert ldapSupport -> openldap != null;
-assert zlibSupport -> zlib != null;
-assert sslSupport -> openssl != null;
-assert scpSupport -> libssh2 != null;
-assert c-aresSupport -> c-ares != null;
+let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
 
+  isLight = suffix == "light";
+  isFull = suffix == "full";
+  nameSuffix = stdenv.lib.optionalString (suffix != "") "-${suffix}";
+
+  # Normal Depedencies
+  optZlib = if isLight then null else shouldUsePkg zlib;
+  optOpenssl = if isLight then null else shouldUsePkg openssl;
+  optLibssh2 = if isLight then null else shouldUsePkg libssh2;
+  optLibnghttp2 = if isLight then null else shouldUsePkg libnghttp2;
+  optC-ares = if isLight then null else shouldUsePkg c-ares;
+
+  # Full dependencies
+  optGss = if !isFull then null else shouldUsePkg gss;
+  optRtmpdump = if !isFull then null else shouldUsePkg rtmpdump;
+  optOpenldap = if !isFull then null else shouldUsePkg openldap;
+  optLibidn = if !isFull then null else shouldUsePkg libidn;
+in
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "curl-7.42.1";
+  name = "curl${nameSuffix}-${version}";
+  version = "7.42.1";
 
   src = fetchurl {
-    url = "http://curl.haxx.se/download/${name}.tar.bz2";
+    url = "http://curl.haxx.se/download/curl-${version}.tar.bz2";
     sha256 = "11y8racpj6m4j9w7wa9sifmqvdgf22nk901sfkbxzhhy75rmk472";
   };
 
-  # Zlib and OpenSSL must be propagated because `libcurl.la' contains
-  # "-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 ++
-    optional sslSupport openssl ++
-    optional scpSupport libssh2;
-
-  # for the second line see http://curl.haxx.se/mail/tracker-2014-03/0087.html
-  preConfigure = ''
-    sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
-    rm src/tool_hugehelp.c
-  '';
+  # Use pkgconfig only when necessary
+  nativeBuildInputs = optional (!isLight) pkgconfig;
+  buildInputs = [
+    optZlib optOpenssl optLibssh2 optLibnghttp2 optC-ares
+    optGss optRtmpdump optOpenldap optLibidn
+  ];
 
-  # make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
+  # Make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
   postConfigure = ''
-    echo  '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE"))' >> lib/curl_config.h
+    echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE"))' >> lib/curl_config.h
   '';
 
   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}";
-
-  CXX = "g++";
-  CXXCPP = "g++ -E";
-
-  crossAttrs = {
-    # We should refer to the cross built openssl
-    # For the 'urandom', maybe it should be a cross-system option
-    configureFlags = [
-        ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
-        "--with-random /dev/urandom"
-      ];
-  };
+    (mkEnable true                    "http"              null)
+    (mkEnable true                    "ftp"               null)
+    (mkEnable true                    "file"              null)
+    (mkEnable (optOpenldap != null)   "ldap"              null)
+    (mkEnable (optOpenldap != null)   "ldaps"             null)
+    (mkEnable true                    "rtsp"              null)
+    (mkEnable true                    "proxy"             null)
+    (mkEnable true                    "dict"              null)
+    (mkEnable true                    "telnet"            null)
+    (mkEnable true                    "tftp"              null)
+    (mkEnable true                    "pop3"              null)
+    (mkEnable true                    "imap"              null)
+    (mkEnable true                    "smb"               null)
+    (mkEnable true                    "smtp"              null)
+    (mkEnable true                    "gopher"            null)
+    (mkEnable (!isLight)              "manual"            null)
+    (mkEnable true                    "libcurl_option"    null)
+    (mkEnable false                   "libgcc"            null) # TODO: Enable on gcc
+    (mkWith   (optZlib != null)       "zlib"              null)
+    (mkEnable true                    "ipv4"              null)
+    (mkWith   (optGss != null)        "gssapi"            null)
+    (mkWith   false                   "winssl"            null)
+    (mkWith   false                   "darwinssl"         null)
+    (mkWith   (optOpenssl != null)    "ssl"               null)
+    (mkWith   false                   "gnutls"            null)
+    (mkWith   false                   "polarssl"          null)
+    (mkWith   false                   "cyassl"            null)
+    (mkWith   false                   "nss"               null)
+    (mkWith   false                   "axtls"             null)
+    (mkWith   false                   "libmetalink"       null)
+    (mkWith   (optLibssh2 != null)    "libssh2"           null)
+    (mkWith   (optRtmpdump!= null)    "librtmp"           null)
+    (mkEnable false                   "versioned-symbols" null)
+    (mkWith   false                   "winidn"            null)
+    (mkWith   (optLibidn != null)     "libidn"            null)
+    (mkWith   (optLibnghttp2 != null) "nghttp2"           null)
+    (mkEnable false                   "sspi"              null)
+    (mkEnable true                    "crypto-auth"       null)
+    (mkEnable (optOpenssl != null)    "tls-srp"           null)
+    (mkEnable true                    "unix-sockets"      null)
+    (mkEnable true                    "cookies"           null)
+    (mkEnable (optC-ares != null)     "ares"              null)
+  ];
 
-  passthru = {
-    inherit sslSupport openssl;
-  };
+  # Fix all broken refernces to dependencies in .la and .pc files
+  postInstall = optionalString (optZlib != null) ''
+    sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  '' + optionalString (optOpenssl != null) ''
+    sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '' + optionalString (optLibssh2 != null) ''
+    sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '' + optionalString (optLibnghttp2 != null) ''
+    sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '' + optionalString (optC-ares != null) ''
+    sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  '' + optionalString (optGss != null) ''
+    sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  '' + optionalString (optRtmpdump != null) ''
+    sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '' + optionalString (optOpenldap != null) ''
+    sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc}
+  '' + optionalString (optLibidn != null) ''
+    sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc
+  '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "A command line tool for transferring files with URL syntax";
     homepage    = http://curl.haxx.se/;
-    maintainers = with maintainers; [ lovek323 ];
+    license     = licenses.mit;
     platforms   = platforms.all;
+    maintainers = with maintainers; [ lovek323 wkennington ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 852ef121a2ac..c9fee6081146 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1097,18 +1097,12 @@ let
 
   cudatoolkit = cudatoolkit5;
 
-  curlFull = curl.override {
-    idnSupport = true;
-    ldapSupport = true;
-    gssSupport = true;
-  };
-
-  curl = callPackage ../tools/networking/curl rec {
+  curl-light = curl.override { suffix = "light"; };
+  curl = curl-full.override {
     fetchurl = fetchurlBoot;
-    zlibSupport = true;
-    sslSupport = zlibSupport;
-    scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
+    suffix = "";
   };
+  curl-full = callPackage ../tools/networking/curl { suffix = "full"; };
 
   curl3 = callPackage ../tools/networking/curl/7.15.nix rec {
     zlibSupport = true;