JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GCJ 4.5: Fix `java.home'.

Browse Source 
svn path=/nixpkgs/trunk/; revision=21999
This commit is contained in:
Ludovic Courtès 2010-05-27 10:23:42 +00:00
parent 4d2a82ab85
commit caf8fe39cf
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/gcc-4.5/default.nix
View File

@ -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 ""}