From 40d1bd9950250974536328ad3aee4d4b81d4ea9b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:12:36 +0000
Subject: [PATCH] openjdk: Replace substitutions with env vars

svn path=/nixpkgs/trunk/; revision=28062
---
 pkgs/development/compilers/openjdk/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 113372fea6a..2af153addec 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -25,15 +25,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip procps ant which ];
 
-  postUnpack = ''
-    substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk \
-      --replace /bin/echo ${coreutils}/bin/echo
-    substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk \
-      --replace /usr/nix/store /nix/store
-  '';
-
   makeFlags = ''
     MKDIR=${coreutils}/bin/mkdir \
+    ECHO=${coreutils}/bin/echo \
     CAT=${coreutils}/bin/cat \
     GREP=${gnugrep}/bin/grep \
     EGREP=${gnugrep}/bin/egrep \