* Disable dynamic linking on Cygwin until we figure out how to deal

  with the lack of an RPATH.

svn path=/nixpkgs/trunk/; revision=5362

1 files changed, 7 insertions, 15 deletions

diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index b66d770782c..191267b7b99 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -43,15 +43,9 @@ rec {
     inherit genericStdenv gccWrapper;
   };
 
-  stdenvNixPkgs = allPackages {
-    bootStdenv = stdenvNix;
-    noSysDirs = false;
-  };
-
 
   # Linux standard environment.
-  inherit (import ./linux {inherit allPackages;})
-    stdenvLinux stdenvLinuxPkgs;
+  inherit (import ./linux {inherit allPackages;}) stdenvLinux;
 
     
   # Darwin (Mac OS X) standard environment.  Very simple for now
@@ -61,11 +55,6 @@ rec {
     inherit genericStdenv gccWrapper;
   };
 
-  stdenvDarwinPkgs = allPackages {
-    bootStdenv = stdenvDarwin;
-    noSysDirs = false;
-  };
-
 
   # FreeBSD standard environment.  Right now this is more or less the
   # same as the native environemnt.  Eventually we'll want a pure
@@ -75,9 +64,11 @@ rec {
     inherit genericStdenv gccWrapper;
   };
 
-  stdenvFreeBSDPkgs = allPackages {
-    bootStdenv = stdenvFreeBSD;
-    noSysDirs = false;
+
+  # Cygwin standard environment.
+  stdenvCygwin = (import ./cygwin) {
+    stdenv = stdenvInitial;
+    inherit genericStdenv gccWrapper;
   };
 
 
@@ -85,6 +76,7 @@ rec {
   stdenv =
     if system == "i686-linux" then stdenvLinux
     else if system == "i686-freebsd" then stdenvFreeBSD
+    else if system == "i686-cygwin" then stdenvCygwin
     else if system == "powerpc-darwin" then stdenvDarwin
     else stdenvNative;
 }