about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2010-08-05 21:06:45 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2010-08-05 21:06:45 +0000
commit80108f291b21a75a1f67ad0dabb08dc7e9b38439 (patch)
tree052ce179fb665219d8d52430ad93c2bf52183432 /pkgs/tools
parent217209747bb70b59cb3918c0d7252eb481a53e52 (diff)
downloadnixlib-80108f291b21a75a1f67ad0dabb08dc7e9b38439.tar
nixlib-80108f291b21a75a1f67ad0dabb08dc7e9b38439.tar.gz
nixlib-80108f291b21a75a1f67ad0dabb08dc7e9b38439.tar.bz2
nixlib-80108f291b21a75a1f67ad0dabb08dc7e9b38439.tar.lz
nixlib-80108f291b21a75a1f67ad0dabb08dc7e9b38439.tar.xz
nixlib-80108f291b21a75a1f67ad0dabb08dc7e9b38439.tar.zst
nixlib-80108f291b21a75a1f67ad0dabb08dc7e9b38439.zip
Add optional scp support to curl
svn path=/nixpkgs/trunk/; revision=22976
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/networking/curl/default.nix6
1 files changed, 4 insertions, 2 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 ""}
   '';