From 0f257e1d5d81b7b748ce3ca113691e1d691c04b4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:14:33 +0000
Subject: [PATCH] openjdk: Remove all coreutils overrides so they can be found
 in
 /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec

svn path=/nixpkgs/trunk/; revision=28076
---
 pkgs/development/compilers/openjdk/default.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index e36e65f14ea5..257595f1e956 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -37,25 +37,13 @@ stdenv.mkDerivation rec {
   '';
 
   makeFlags = ''
-    MKDIR=${coreutils}/bin/mkdir \
-    LN=${coreutils}/bin/ln \
     LDD=${glibc}/bin/ldd \
     NM=${binutils}/bin/nm \
     READELF=${binutils}/bin/readelf \
-    MV=${coreutils}/bin/mv \
-    TOUCH=${coreutils}/bin/touch \
-    CP=${coreutils}/bin/cp \
-    CHMOD=${coreutils}/bin/chmod \
-    ECHO=${coreutils}/bin/echo \
-    CAT=${coreutils}/bin/cat \
     GREP=${gnugrep}/bin/grep \
     EGREP=${gnugrep}/bin/egrep \
-    DATE=${coreutils}/bin/date \
-    PWD=${coreutils}/bin/pwd \
-    TR=${coreutils}/bin/tr \
     SED=${gnused}/bin/sed \
     ALSA_INCLUDE=${alsaLib}/include/alsa/version.h \
-    HEAD=${coreutils}/bin/head \
     ZIPEXE=${zip}/bin/zip \
     FREETYPE_HEADERS_PATH=${freetype}/include \
     FREETYPE_LIB_PATH=${freetype}/lib \
@@ -66,7 +54,6 @@ stdenv.mkDerivation rec {
     COMPILER_PATH="" \
     DEVTOOLS_PATH="" \
     NAWK=${gawk}/bin/gawk \
-    PRINTF=${coreutils}/bin/printf \
     BOOTDIR=${jdk} \
     FIND=${findutils}/bin/find \
     ALLOW_DOWNLOADS=true \