From f0129a3f446021b55e05cf9a77ad9684d3ea207a Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Fri, 25 Aug 2006 20:58:02 +0000
Subject: [PATCH] Fixes to support the new stdenvType

svn path=/nixpkgs/trunk/; revision=6242
---
 pkgs/development/libraries/aterm/aterm-2.4.nix | 2 +-
 pkgs/stdenv/mingw/default.nix                  | 1 +
 pkgs/top-level/mingw.nix                       | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/aterm/aterm-2.4.nix b/pkgs/development/libraries/aterm/aterm-2.4.nix
index 66180eb10f87..fc88ef34692f 100644
--- a/pkgs/development/libraries/aterm/aterm-2.4.nix
+++ b/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";
diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix
index 4c17e73fb548..8bfb40e386eb 100644
--- a/pkgs/stdenv/mingw/default.nix
+++ b/pkgs/stdenv/mingw/default.nix
@@ -80,6 +80,7 @@ let {
           shell = msysShell;
           inherit curl;
           isDarwin = false;
+          isMinGW = true;
         };
 
       mkDerivationFun = {
diff --git a/pkgs/top-level/mingw.nix b/pkgs/top-level/mingw.nix
index a0995b279c21..87f85b2d850b 100755
--- a/pkgs/top-level/mingw.nix
+++ b/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;
   };
 }