diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-14 20:38:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-14 20:38:09 +0200 |
| commit | d1ed0f44cd154926e761cedee1cee72e55345807 (patch) | |
| tree | 381796ca487661dc1faf00a73d3d7aa5622edbb8 /pkgs/stdenv | |
| parent | 59291fdbf4e26a2b09a1d39a0582a874d78d6797 (diff) | |
| parent | 86e18c965f1fd66f72bcadc065e6e5350f11ba0f (diff) | |
Merge #2823: better cygwin support, also add x86_64
Conflicts (easy): pkgs/development/interpreters/perl/5.16/default.nix
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 0d8355e89cc38..595307df55643 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -143,7 +143,8 @@ let || system == "x86_64-kfreebsd-gnu"; isSunOS = system == "i686-solaris" || system == "x86_64-solaris"; - isCygwin = system == "i686-cygwin"; + isCygwin = system == "i686-cygwin" + || system == "x86_64-cygwin"; isFreeBSD = system == "i686-freebsd" || system == "x86_64-freebsd"; isOpenBSD = system == "i686-openbsd" |