From 19158d7dec4edabb8ae572e0d6afe99c129866c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Aug 2010 11:54:55 +0000
Subject: [PATCH] * CURL: build without scp support on Cygwin because libssh2
 doesn't   build.

svn path=/nixpkgs/trunk/; revision=23142
---
 pkgs/stdenv/generic/default.nix | 1 +
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index b30b9c8d4dc..1d7aaae7ccd 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -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"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5a46a2dc10..e98212f86bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };