public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add optional scp support to curl

Browse Source 
svn path=/nixpkgs/trunk/; revision=22976
This commit is contained in:
Yury G. Kudryashov 2010-08-05 21:06:45 +00:00
parent 217209747b
commit 80108f291b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/curl/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl { stdenv, fetchurl
, zlibSupport ? false, zlib ? null , zlibSupport ? false, zlib
, sslSupport ? false, openssl ? null , sslSupport ? false, openssl
, scpSupport ? false, libssh2
, linkStatic ? false , linkStatic ? false
}: }:
@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
configureFlags = '' configureFlags = ''
${if sslSupport then "--with-ssl=${openssl}" else "--without-ssl"} ${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 ""} ${if linkStatic then "--enable-static --disable-shared" else ""}
''; '';

7
pkgs/top-level/all-packages.nix
View File

@ -488,11 +488,12 @@ let
cron = callPackage ../tools/system/cron { # see also fcron cron = callPackage ../tools/system/cron { # see also fcron
}; };
curl = makeOverridable (import ../tools/networking/curl) { curl = makeOverridable (import ../tools/networking/curl) rec {
fetchurl = fetchurlBoot; fetchurl = fetchurlBoot;
inherit stdenv zlib openssl; inherit stdenv zlib openssl libssh2;
zlibSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic)); zlibSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic));
sslSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic)); sslSupport = zlibSupport;
scpSupport = zlibSupport;
}; };
curlftpfs = callPackage ../tools/filesystems/curlftpfs { }; curlftpfs = callPackage ../tools/filesystems/curlftpfs { };