mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 04:12:44 +03:00
openjdk: Remove all hardcoded binary overrides except echo
svn path=/nixpkgs/trunk/; revision=28080
This commit is contained in:
parent
a0022251d9
commit
d0fe9fa2e8
@ -39,14 +39,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = ''
|
||||
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 \
|
||||
ZIPEXE=${zip}/bin/zip \
|
||||
FREETYPE_HEADERS_PATH=${freetype}/include \
|
||||
FREETYPE_LIB_PATH=${freetype}/lib \
|
||||
MILESTONE="release" \
|
||||
@ -56,11 +49,8 @@ stdenv.mkDerivation rec {
|
||||
COMPILER_PATH="" \
|
||||
DEVTOOLS_PATH="" \
|
||||
UNIXCOMMAND_PATH="" \
|
||||
NAWK=${gawk}/bin/gawk \
|
||||
BOOTDIR=${jdk} \
|
||||
FIND=${findutils}/bin/find \
|
||||
ALLOW_DOWNLOADS=true \
|
||||
CC=${stdenv.gcc}/bin/gcc
|
||||
ALLOW_DOWNLOADS=true
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
|
Loading…
Reference in New Issue
Block a user