* CURL: build without scp support on Cygwin because libssh2 doesn't
build. svn path=/nixpkgs/trunk/; revision=23142
This commit is contained in:
parent
ff1c057f7a
commit
19158d7dec
|
@ -96,6 +96,7 @@ let
|
|||
|| result.system == "powerpc-linux"
|
||||
|| result.system == "armv5tel-linux";
|
||||
isSunOS = result.system == "i386-sunos";
|
||||
isCygwin = result.system == "i686-cygwin";
|
||||
isi686 = result.system == "i686-linux"
|
||||
|| result.system == "i686-darwin"
|
||||
|| result.system == "i686-freebsd"
|
||||
|
|
|
@ -485,7 +485,7 @@ let
|
|||
inherit stdenv zlib openssl libssh2;
|
||||
zlibSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic));
|
||||
sslSupport = zlibSupport;
|
||||
scpSupport = zlibSupport && (!stdenv.isSunOS);
|
||||
scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
|
||||
};
|
||||
|
||||
curlftpfs = callPackage ../tools/filesystems/curlftpfs { };
|
||||
|
|
Loading…
Reference in a new issue