diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-05-26 14:53:04 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-05-26 14:53:04 +0000 |
| commit | 7132072986eb1d1accd42daa3a83a54d7f86e556 (patch) | |
| tree | dad4bbe9bd1b8398170169551ef9a5299168717b /pkgs/development | |
| parent | 343bbc271220692ce1f5eb7fb15b7e03fce922c3 (diff) | |
| download | nixpkgs-7132072986eb1d1accd42daa3a83a54d7f86e556.tar nixpkgs-7132072986eb1d1accd42daa3a83a54d7f86e556.tar.gz nixpkgs-7132072986eb1d1accd42daa3a83a54d7f86e556.tar.bz2 nixpkgs-7132072986eb1d1accd42daa3a83a54d7f86e556.tar.lz nixpkgs-7132072986eb1d1accd42daa3a83a54d7f86e556.tar.xz nixpkgs-7132072986eb1d1accd42daa3a83a54d7f86e556.tar.zst nixpkgs-7132072986eb1d1accd42daa3a83a54d7f86e556.zip | |
GCJ 4.5: Fix value of the `java.home' property.
svn path=/nixpkgs/trunk/; revision=21988
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/gcc-4.5/default.nix | 3 |
1 files changed, 1 insertions, 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 ""} |