Author: eelco
Date: Thu Aug 12 11:54:55 2010
New Revision: 23142
URL: https://svn.nixos.org/websvn/nix/?rev=23142&sc=1
Log:
* CURL: build without scp support on Cygwin because libssh2 doesn't
build.
Modified:
nixpkgs/trunk/pkgs/stdenv/generic/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/stdenv/generic/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/stdenv/generic/default.nix Thu Aug 12 11:23:54
2010 (r23141)
+++ nixpkgs/trunk/pkgs/stdenv/generic/default.nix Thu Aug 12 11:54:55
2010 (r23142)
@@ -96,6 +96,7 @@
|| 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"
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 12 11:23:54
2010 (r23141)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 12 11:54:55
2010 (r23142)
@@ -485,7 +485,7 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
