From 36debce744e37a6c48c38af6a886459aa9375e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 13 Oct 2008 09:06:04 +0000
Subject: [PATCH] Use `gnumakeNix' instead of `gnumake' in `stdenv'.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13056
---
 pkgs/stdenv/common-path.nix                | 2 +-
 pkgs/stdenv/linux/default.nix              | 2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 4 ++--
 pkgs/stdenv/mingw/pkgs/default.nix         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/common-path.nix b/pkgs/stdenv/common-path.nix
index 3b267a543c66..227870a943a0 100644
--- a/pkgs/stdenv/common-path.nix
+++ b/pkgs/stdenv/common-path.nix
@@ -8,7 +8,7 @@
   pkgs.gnutar
   pkgs.gzip
   pkgs.bzip2
-  pkgs.gnumake
+  pkgs.gnumakeNix
   pkgs.bash
   pkgs.patch
   pkgs.replace
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 30516de54cc3..69b4046a6cdc 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -217,7 +217,7 @@ rec {
       inherit (stdenvLinuxBoot2Pkgs) binutils /* gcc */ glibc;
       inherit (stdenvLinuxBoot3Pkgs)
         gzip bzip2 bash coreutils diffutils findutils gawk
-        gnumake gnused gnutar gnugrep patch patchelf
+        gnumakeNix gnused gnutar gnugrep patch patchelf
         attr acl;
     };
   };
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 71aa638378c5..9d381cca7e15 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -10,7 +10,7 @@ let
   # dietlibc.
   pkgsToRemove = 
     [ "binutils" "gcc" "coreutils" "findutils" "diffutils" "gnused" "gnugrep"
-      "gawk" "gnutar" "gzip" "bzip2" "gnumake" "bash" "patch" "patchelf"
+      "gawk" "gnutar" "gzip" "bzip2" "gnumakeNix" "bash" "patch" "patchelf"
     ];
 
   pkgsDiet = import ../../top-level/all-packages.nix {
@@ -28,7 +28,7 @@ let
 
     inherit (pkgsDiet)
       coreutils diffutils gnugrep
-      gzip bzip2 gnumake bash patch binutils curl;
+      gzip bzip2 gnumakeNix bash patch binutils curl;
 
     findutils = pkgsDiet.findutils4227; # 4.2.28 is broken
       
diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix
index 6c843e8d3943..c0bad491e784 100755
--- a/pkgs/stdenv/mingw/pkgs/default.nix
+++ b/pkgs/stdenv/mingw/pkgs/default.nix
@@ -150,7 +150,7 @@ rec {
   pkgs.gnutar
   pkgs.gzip
   pkgs.bzip2
-  pkgs.gnumake
+  pkgs.gnumakeNix
   pkgs.bash
   pkgs.patch
   */