diff options
author | Shea Levy <shea@shealevy.com> | 2011-08-01 01:15:05 +0000 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2011-08-01 01:15:05 +0000 |
commit | d0fe9fa2e809af001de1fd3b1037a748b4e8aa3a (patch) | |
tree | e63c2f0855798eff2d8376162ac4c9b035648831 /pkgs/development/compilers/openjdk | |
parent | a0022251d98880e62d19222d499b0d1424caa4e7 (diff) | |
download | nixlib-d0fe9fa2e809af001de1fd3b1037a748b4e8aa3a.tar nixlib-d0fe9fa2e809af001de1fd3b1037a748b4e8aa3a.tar.gz nixlib-d0fe9fa2e809af001de1fd3b1037a748b4e8aa3a.tar.bz2 nixlib-d0fe9fa2e809af001de1fd3b1037a748b4e8aa3a.tar.lz nixlib-d0fe9fa2e809af001de1fd3b1037a748b4e8aa3a.tar.xz nixlib-d0fe9fa2e809af001de1fd3b1037a748b4e8aa3a.tar.zst nixlib-d0fe9fa2e809af001de1fd3b1037a748b4e8aa3a.zip |
openjdk: Remove all hardcoded binary overrides except echo
svn path=/nixpkgs/trunk/; revision=28080
Diffstat (limited to 'pkgs/development/compilers/openjdk')
-rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 7b9741f124d1..db52dbffa599 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -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 = '' |