From f70d3b72df7d63e7c63af3796cfcd572e2fc5b9e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 1 Aug 2011 01:15:37 +0000 Subject: [PATCH] openjdk: We need ECHO to be echo -e, so replace the override with a sed svn path=/nixpkgs/trunk/; revision=28084 --- pkgs/development/compilers/openjdk/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 9205849b206..8db69b126be 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"