Fixes to support the new stdenvType

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

pkgs/development/libraries/aterm/aterm-2.4.nix

@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   };
   patches = 
     [./aterm-alias-fix-2.patch] ++
-    (if stdenv.system == "i686-mingw" then [./mingw-asm.patch] else []);
+    (if stdenv ? isMinGW && stdenv.isMinGW then [./mingw-asm.patch] else []);
   meta = {
     homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
     license = "LGPL";

pkgs/stdenv/mingw/default.nix

@@ -80,6 +80,7 @@ let {
           shell = msysShell;
           inherit curl;
           isDarwin = false;
+          isMinGW = true;
         };
 
       mkDerivationFun = {

pkgs/top-level/mingw.nix

@@ -1,10 +1,11 @@
 let {
   pkgs =
     import ./all-packages.nix {
-      system = "i686-mingw";
+      stdenvType = "i686-mingw";
     };
 
   body = {
-    inherit (pkgs) zlib getopt realCurl aterm;
+    inherit (pkgs) zlib getopt realCurl aterm pkgconfig_latest;
+    inherit (pkgs.gtkLibs28) glib;
   };
 }