diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 7d545e8c7fb1..0fea977cd058 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl -, zlibSupport ? false, zlib ? null -, sslSupport ? false, openssl ? null +, zlibSupport ? false, zlib +, sslSupport ? false, openssl +, scpSupport ? false, libssh2 , linkStatic ? false }: @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { configureFlags = '' ${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"} + ${if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2"} ${if linkStatic then "--enable-static --disable-shared" else ""} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 515dbf72d443..932e355f7f40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -488,11 +488,12 @@ let cron = callPackage ../tools/system/cron { # see also fcron }; - curl = makeOverridable (import ../tools/networking/curl) { + curl = makeOverridable (import ../tools/networking/curl) rec { fetchurl = fetchurlBoot; - inherit stdenv zlib openssl; + inherit stdenv zlib openssl libssh2; zlibSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic)); - sslSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic)); + sslSupport = zlibSupport; + scpSupport = zlibSupport; }; curlftpfs = callPackage ../tools/filesystems/curlftpfs { };