diff options
author | Robert Helgesson <robert@rycee.net> | 2015-07-26 23:34:06 +0200 |
---|---|---|
committer | Robert Helgesson <robert@rycee.net> | 2015-07-27 17:37:37 +0200 |
commit | 923dda992bcf629e8301beec7f04dfbbd40bb0e9 (patch) | |
tree | 63bcac7e479d1ca6fe961018e6d7dbf8c140d646 /pkgs/development/eclipse | |
parent | 8897299e8f375555d9c9819612fede3d5c86ccc9 (diff) |
ecj: require jdk7 instead of jdk
The ecj build fails in Java 8 due to backwards incompatible changes in
the `javax.lang.model` namespace so with this change we specifically ask
for a JDK for Java 7.
Diffstat (limited to 'pkgs/development/eclipse')
-rw-r--r-- | pkgs/development/eclipse/ecj/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix index 19ec3a3a2fb5..b6bee8aead02 100644 --- a/pkgs/development/eclipse/ecj/default.nix +++ b/pkgs/development/eclipse/ecj/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }: +{ stdenv, fetchurl, unzip, ant, jdk7, makeWrapper }: let version = "3.7.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm"; }; - buildInputs = [ unzip ant jdk makeWrapper ]; + buildInputs = [ unzip ant jdk7 makeWrapper ]; unpackPhase = '' mkdir "${name}" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cp -v *.jar $out/share/java mkdir -pv $out/bin - makeWrapper ${jdk.jre}/bin/java $out/bin/ecj \ + makeWrapper ${jdk7.jre}/bin/java $out/bin/ecj \ --add-flags "-cp $out/share/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main" # Add a setup hook that causes Ant to use the ECJ. |