Build the mingw w32api from source for the mingw stdenv

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

pkgs/stdenv/mingw/default.nix

@@ -85,7 +85,7 @@ let {
           builder = ./builder.sh;
           substitute = ../../build-support/substitute/substitute.sh;
           setup = ./setup.sh;
-          initialPath = [mingwRuntimeSrc make msys];
+          initialPath = [mingwRuntimeSrc w32apiSrc make msys];
           gcc = gccWrapper;
           shell = msysShell;
         };
@@ -181,4 +181,10 @@ let {
       stdenv = stdenvInit3;
       inherit fetchurl;
     };
+
+  w32apiSrc =
+    (import ./pkgs).w32apiSrc {
+      stdenv = stdenvInit3;
+      inherit fetchurl;
+    };
 }

pkgs/stdenv/mingw/pkgs/default.nix

@@ -59,7 +59,7 @@ rec {
   mingwRuntimeSrc = {stdenv, fetchurl} :
     stdenv.mkDerivation {
       name = "mingw-runtime-3.10";
-      builder = ./mingw-runtime-builder.sh;
+      builder = ./src-builder.sh;
       src =
         fetchurl {
           url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.10-src.tar.gz;
@@ -78,6 +78,16 @@ rec {
         };
     };
 
+  w32apiSrc = {stdenv, fetchurl} :
+    stdenv.mkDerivation {
+      name = "w32api-3.7";
+      builder = ./src-builder.sh;
+      src = 
+        fetchurl {
+          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/w32api-3.7-src.tar.gz;
+          md5 = "d799c407b4c1b480d0339994d01f355d";
+        };
+    };
 
   /*
   pkgs.coreutils

pkgs/stdenv/mingw/pkgs/src-builder.sh

@@ -1,11 +1,7 @@
 source $STDENV/setup
 
 tar zxvf $SRC
-cd mingw-runtime-*
+cd $NAME
 ./configure --prefix=$OUT
 make
 make install
-
-
-
-