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

* CURL: build without scp support on Cygwin because libssh2 doesn't

Browse Source 
build.

svn path=/nixpkgs/trunk/; revision=23142
This commit is contained in:
Eelco Dolstra 2010-08-12 11:54:55 +00:00
parent ff1c057f7a
commit 19158d7dec
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/stdenv/generic/default.nix
View File

@ -96,6 +96,7 @@ let
|| result.system == "powerpc-linux" || result.system == "powerpc-linux"
|| result.system == "armv5tel-linux"; || result.system == "armv5tel-linux";
isSunOS = result.system == "i386-sunos"; isSunOS = result.system == "i386-sunos";
isCygwin = result.system == "i686-cygwin";
isi686 = result.system == "i686-linux" isi686 = result.system == "i686-linux"
|| result.system == "i686-darwin" || result.system == "i686-darwin"
|| result.system == "i686-freebsd" || result.system == "i686-freebsd"

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

@ -485,7 +485,7 @@ let
inherit stdenv zlib openssl libssh2; inherit stdenv zlib openssl libssh2;
zlibSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic)); zlibSupport = ! ((stdenv ? isDietLibC) || (stdenv ? isStatic));
sslSupport = zlibSupport; sslSupport = zlibSupport;
scpSupport = zlibSupport && (!stdenv.isSunOS); scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
}; };
curlftpfs = callPackage ../tools/filesystems/curlftpfs { }; curlftpfs = callPackage ../tools/filesystems/curlftpfs { };