Author: urkud
Date: Thu Aug 5 21:06:45 2010
New Revision: 22976
URL: https://svn.nixos.org/websvn/nix/?rev=22976&sc=1
Log:
Add optional scp support to curl
Modified:
nixpkgs/trunk/pkgs/tools/networking/curl/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/curl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/curl/default.nix Thu Aug 5
20:24:32 2010 (r22975)
+++ nixpkgs/trunk/pkgs/tools/networking/curl/default.nix Thu Aug 5
21:06:45 2010 (r22976)
@@ -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 @@
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 ""}
'';
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 5 20:24:32
2010 (r22975)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 5 21:06:45
2010 (r22976)
@@ -488,11 +488,12 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
