openjdk: Remove all hardcoded binary overrides except echo

svn path=/nixpkgs/trunk/; revision=28080
This commit is contained in:
Shea Levy 2011-08-01 01:15:05 +00:00
parent a0022251d9
commit d0fe9fa2e8

View File

@ -39,14 +39,7 @@ stdenv.mkDerivation rec {
makeFlags = '' makeFlags = ''
ECHO=${coreutils}/bin/echo \ ECHO=${coreutils}/bin/echo \
LDD=${glibc}/bin/ldd \
NM=${binutils}/bin/nm \
READELF=${binutils}/bin/readelf \
GREP=${gnugrep}/bin/grep \
EGREP=${gnugrep}/bin/egrep \
SED=${gnused}/bin/sed \
ALSA_INCLUDE=${alsaLib}/include/alsa/version.h \ ALSA_INCLUDE=${alsaLib}/include/alsa/version.h \
ZIPEXE=${zip}/bin/zip \
FREETYPE_HEADERS_PATH=${freetype}/include \ FREETYPE_HEADERS_PATH=${freetype}/include \
FREETYPE_LIB_PATH=${freetype}/lib \ FREETYPE_LIB_PATH=${freetype}/lib \
MILESTONE="release" \ MILESTONE="release" \
@ -56,11 +49,8 @@ stdenv.mkDerivation rec {
COMPILER_PATH="" \ COMPILER_PATH="" \
DEVTOOLS_PATH="" \ DEVTOOLS_PATH="" \
UNIXCOMMAND_PATH="" \ UNIXCOMMAND_PATH="" \
NAWK=${gawk}/bin/gawk \
BOOTDIR=${jdk} \ BOOTDIR=${jdk} \
FIND=${findutils}/bin/find \ ALLOW_DOWNLOADS=true
ALLOW_DOWNLOADS=true \
CC=${stdenv.gcc}/bin/gcc
''; '';
configurePhase = '' configurePhase = ''