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

ecj: require jdk7 instead of jdk

Browse Source 
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.
This commit is contained in:
Robert Helgesson 2015-07-26 23:34:06 +02:00
parent 8897299e8f
commit 923dda992b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/eclipse/ecj/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }: { stdenv, fetchurl, unzip, ant, jdk7, makeWrapper }:
let let
version = "3.7.2"; version = "3.7.2";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm"; sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm";
}; };
buildInputs = [ unzip ant jdk makeWrapper ]; buildInputs = [ unzip ant jdk7 makeWrapper ];
unpackPhase = '' unpackPhase = ''
mkdir "${name}" mkdir "${name}"
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
cp -v *.jar $out/share/java cp -v *.jar $out/share/java
mkdir -pv $out/bin 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-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. # Add a setup hook that causes Ant to use the ECJ.