From b3ab977d903e6a778fff8a004f7b69d02b433690 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 1 Aug 2011 01:08:58 +0000
Subject: [PATCH] openjdk: Factor path overrides out into makeFlags

svn path=/nixpkgs/trunk/; revision=28035
---
 pkgs/development/compilers/openjdk/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 115c2ceb86c..db49e8bdf2f 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, unzip, procps, coreutils}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "openjdk-7b127";
 
   src = fetchurl {
@@ -17,8 +17,13 @@ stdenv.mkDerivation {
       --replace /usr/nix/store /nix/store
   '';
 
+  makeFlags = ''
+    MKDIR=${coreutils}/bin/mkdir \
+    CC=${stdenv.gcc}/bin/gcc
+  '';
+
   configurePhase = ''
-    make MKDIR=${coreutils}/bin/mkdir CC=${stdenv.gcc}/bin/gcc sanity
+    make ${makeFlags} sanity
   '';
 }