From 80108f291b21a75a1f67ad0dabb08dc7e9b38439 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Aug 2010 21:06:45 +0000
Subject: [PATCH] Add optional scp support to curl

svn path=/nixpkgs/trunk/; revision=22976
---
 pkgs/tools/networking/curl/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix        | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

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 { };