* Support different kinds of stdenvs on a particular system (like

  "i686-cygwin") by adding an argument "stdenvType" to specify which
  stdenv to use (like "i686-mingw").

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

1 files changed, 12 insertions, 2 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fa6aacad57..9308894d531 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5,9 +5,18 @@
    platform. */
    
 
-{ # The system for which to build the packages.
+{ # The system (e.g., `i686-linux') for which to build the packages.
   system ? __currentSystem
 
+  # Usually, the system type uniquely determines the stdenv and thus
+  # how to build the packages.  But on some platforms we have
+  # different stdenvs, leading to different ways to build the
+  # packages.  For instance, on Windows we support both Cygwin and
+  # Mingw builds.  In both cases, `system' is `i686-cygwin'.  The
+  # attribute `stdenvType' is used to select the specific kind of
+  # stdenv to use, e.g., `i686-mingw'.
+, stdenvType ? system
+
 , # The standard environment to use.  Only used for bootstrapping.  If
   # null, the default standard environment is used.
   bootStdenv ? null
@@ -71,7 +80,7 @@ rec {
 
   defaultStdenv =
     (import ../stdenv {
-      inherit system;
+      inherit system stdenvType;
       allPackages = import ./all-packages.nix;
     }).stdenv;
 
@@ -1248,6 +1257,7 @@ rec {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng;
   };
+  
   gtkLibs22 = import ../development/libraries/gtk-libs-2.2 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng;