diff options
| author | Shea Levy <shea@shealevy.com> | 2011-08-01 01:15:37 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-08-01 01:15:37 +0000 |
| commit | f70d3b72df7d63e7c63af3796cfcd572e2fc5b9e (patch) | |
| tree | e4891fc04c47cfe0bd2defd181dc13199291bb78 /pkgs/development/compilers/openjdk | |
| parent | 5fca670490f3872de1296f67553361527be8337a (diff) | |
| download | nixlib-f70d3b72df7d63e7c63af3796cfcd572e2fc5b9e.tar nixlib-f70d3b72df7d63e7c63af3796cfcd572e2fc5b9e.tar.gz nixlib-f70d3b72df7d63e7c63af3796cfcd572e2fc5b9e.tar.bz2 nixlib-f70d3b72df7d63e7c63af3796cfcd572e2fc5b9e.tar.lz nixlib-f70d3b72df7d63e7c63af3796cfcd572e2fc5b9e.tar.xz nixlib-f70d3b72df7d63e7c63af3796cfcd572e2fc5b9e.tar.zst nixlib-f70d3b72df7d63e7c63af3796cfcd572e2fc5b9e.zip | |
openjdk: We need ECHO to be echo -e, so replace the override with a sed
svn path=/nixpkgs/trunk/; revision=28084
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 9205849b206f..8db69b126be9 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -29,10 +29,12 @@ stdenv.mkDerivation rec { sed -i s@/bin/ls@${coreutils}/bin/ls@ \ openjdk/hotspot/make/linux/makefiles/sa.make + + sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ + openjdk/jdk/make/common/shared/Defs-utils.gmk ''; makeFlags = [ - "ECHO=${coreutils}/bin/echo" "SORT=${coreutils}/bin/sort" "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h" "FREETYPE_HEADERS_PATH=${freetype}/include" |