From 884b6f9a0daed92f6bf75888ee025f896fdf9021 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Wed, 16 Aug 2006 14:15:00 +0000
Subject: [PATCH] Added make

svn path=/nixpkgs/trunk/; revision=6131
---
 pkgs/stdenv/mingw/default.nix         | 10 +++++++-
 pkgs/stdenv/mingw/pkgs/bin-builder.sh |  5 ++++
 pkgs/stdenv/mingw/pkgs/default.nix    | 34 +++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/stdenv/mingw/pkgs/bin-builder.sh
 create mode 100755 pkgs/stdenv/mingw/pkgs/default.nix

diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix
index 517470bcd81a..a60255c46f80 100644
--- a/pkgs/stdenv/mingw/default.nix
+++ b/pkgs/stdenv/mingw/default.nix
@@ -47,6 +47,8 @@ let {
 
   /**
    * MSYS, installed using stdenvInit1
+   *
+   * @todo Maybe remove the make of msys?
    */
   msys =
     stdenvInit1.mkDerivation {
@@ -71,13 +73,19 @@ let {
 
       shell = msys + /bin/sh + ".exe";
 
+      make =
+        (import ./pkgs).make {
+          stdenv = stdenvInit2;
+          inherit fetchurl;
+        };
+
       stdenv =
         stdenvInit2.mkDerivation {
           name = "stdenv-mingw";
           builder = ./builder.sh;
           substitute = ../../build-support/substitute/substitute.sh;
           setup = ./setup.sh;
-          initialPath = [msys];
+          initialPath = [make msys];
           inherit shell;
           gcc = msys; # TODO
         };
diff --git a/pkgs/stdenv/mingw/pkgs/bin-builder.sh b/pkgs/stdenv/mingw/pkgs/bin-builder.sh
new file mode 100644
index 000000000000..f4f21d50a458
--- /dev/null
+++ b/pkgs/stdenv/mingw/pkgs/bin-builder.sh
@@ -0,0 +1,5 @@
+source $STDENV/setup
+
+mkdir $OUT
+cd $OUT
+tar zxvf $SRC
diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix
new file mode 100755
index 000000000000..151450e5c92b
--- /dev/null
+++ b/pkgs/stdenv/mingw/pkgs/default.nix
@@ -0,0 +1,34 @@
+/**
+ * MinGW packages.
+ */
+rec {
+
+  /**
+   * Make. Binary.
+   */
+  make = {stdenv, fetchurl} :
+    stdenv.mkDerivation {
+      name = "mingw32-make-3.81";
+      builder = ./bin-builder.sh;
+      src = 
+        fetchurl {
+          url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/mingw32-make-3.81-1.tar.gz;
+          md5 = "74c2f44ecc699b318edeb07d838feae5";
+        };
+    };
+
+  /*
+  pkgs.coreutils
+  pkgs.findutils
+  pkgs.diffutils
+  pkgs.gnused
+  pkgs.gnugrep
+  pkgs.gawk
+  pkgs.gnutar
+  pkgs.gzip
+  pkgs.bzip2
+  pkgs.gnumake
+  pkgs.bash
+  pkgs.patch
+  */
+}
\ No newline at end of file