From caf8fe39cff02a9e99f2d8b08027c164ae80985f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 27 May 2010 10:23:42 +0000
Subject: [PATCH] GCJ 4.5: Fix `java.home'.

svn path=/nixpkgs/trunk/; revision=21999
---
 pkgs/development/compilers/gcc-4.5/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix
index 7ab38022db9..ecc5746be23 100644
--- a/pkgs/development/compilers/gcc-4.5/default.nix
+++ b/pkgs/development/compilers/gcc-4.5/default.nix
@@ -190,7 +190,10 @@ stdenv.mkDerivation ({
     ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""}
     ${if langJava then
       "--with-ecj-jar=${javaEcj} " +
-      "--enable-java-home --with-java-home=\${prefix}/lib/jvm "
+
+      # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See
+      # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.
+      "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre "
       else ""}
     ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
     ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}