openjdk: Replace substitutions with env vars
svn path=/nixpkgs/trunk/; revision=28062
This commit is contained in:
parent
b1b5b09557
commit
40d1bd9950
|
@ -25,15 +25,9 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [ unzip procps ant which ];
|
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 = ''
|
makeFlags = ''
|
||||||
MKDIR=${coreutils}/bin/mkdir \
|
MKDIR=${coreutils}/bin/mkdir \
|
||||||
|
ECHO=${coreutils}/bin/echo \
|
||||||
CAT=${coreutils}/bin/cat \
|
CAT=${coreutils}/bin/cat \
|
||||||
GREP=${gnugrep}/bin/grep \
|
GREP=${gnugrep}/bin/grep \
|
||||||
EGREP=${gnugrep}/bin/egrep \
|
EGREP=${gnugrep}/bin/egrep \
|
||||||
|
|
Loading…
Reference in New Issue