From 7132072986eb1d1accd42daa3a83a54d7f86e556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 26 May 2010 14:53:04 +0000 Subject: [PATCH] GCJ 4.5: Fix value of the `java.home' property. svn path=/nixpkgs/trunk/; revision=21988 --- pkgs/development/compilers/gcc-4.5/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 855ac76aebb..7ab38022db9 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -190,8 +190,7 @@ stdenv.mkDerivation ({ ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""} ${if langJava then "--with-ecj-jar=${javaEcj} " + - "--enable-java-home --with-java-home=\${prefix} " + - "--with-jvm-root-dir=\${prefix}/jdk" + "--enable-java-home --with-java-home=\${prefix}/lib/jvm " else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}