From 5f88a929ccf2b44e9468948ac8b4443d5fa32d5c Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Wed, 16 Aug 2006 14:35:43 +0000
Subject: [PATCH] Added mingw gcc

svn path=/nixpkgs/trunk/; revision=6132
---
 pkgs/stdenv/mingw/default.nix      | 11 ++++++-----
 pkgs/stdenv/mingw/pkgs/default.nix | 27 +++++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix
index a60255c46f8..65597dc6161 100644
--- a/pkgs/stdenv/mingw/default.nix
+++ b/pkgs/stdenv/mingw/default.nix
@@ -73,10 +73,10 @@ let {
 
       shell = msys + /bin/sh + ".exe";
 
-      make =
-        (import ./pkgs).make {
+      binpkgs =
+        (import ./pkgs) {
           stdenv = stdenvInit2;
-          inherit fetchurl;
+          inherit fetchurl;   
         };
 
       stdenv =
@@ -85,9 +85,10 @@ let {
           builder = ./builder.sh;
           substitute = ../../build-support/substitute/substitute.sh;
           setup = ./setup.sh;
-          initialPath = [make msys];
+          initialPath = [binpkgs.make msys];
           inherit shell;
-          gcc = msys; # TODO
+          # todo: wrapper?
+          gcc = binpkgs.gcc;
         };
 
       mkDerivationFun = {
diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix
index 151450e5c92..2c8acf8481c 100755
--- a/pkgs/stdenv/mingw/pkgs/default.nix
+++ b/pkgs/stdenv/mingw/pkgs/default.nix
@@ -1,14 +1,23 @@
 /**
  * MinGW packages.
  */
-rec {
+let {
+
+  /**
+   * stdenv and fetchurl are parameters of every function to make this more flexible:
+   * after some packages, we might be able to use a better stdenv/fetchurl.
+   */
+  body = {stdenv, fetchurl} : {
+    make = make { inherit stdenv fetchurl; };
+    gcc  = gcc  { inherit stdenv fetchurl; };
+  };
 
   /**
    * Make. Binary.
    */
   make = {stdenv, fetchurl} :
     stdenv.mkDerivation {
-      name = "mingw32-make-3.81";
+      name = "mingw-make-3.81";
       builder = ./bin-builder.sh;
       src = 
         fetchurl {
@@ -17,6 +26,20 @@ rec {
         };
     };
 
+  /**
+   * GCC. Binary
+   */
+  gcc =  {stdenv, fetchurl} :
+    stdenv.mkDerivation {
+      name = "mingw-gcc-core-3.4.2-20040916-1";
+      builder = ./bin-builder.sh;
+      src = 
+        fetchurl {
+          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/gcc-core-3.4.2-20040916-1.tar.gz;
+          md5 = "d9cd78f926fc31ef101c6fa7072fc65d";
+        };
+    };
+
   /*
   pkgs.coreutils
   pkgs.findutils