diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-27 15:50:11 -0400 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-27 15:50:11 -0400 |
| commit | 56ed2e9b1133b0c2a686b0780d1158081e7e6240 (patch) | |
| tree | c2e4b590840e0089b975138e2d6f91dff1ddb040 | |
| parent | ace332eb36fd537c9a2674d591fd5e723f8fcb62 (diff) | |
| parent | 923dda992bcf629e8301beec7f04dfbbd40bb0e9 (diff) | |
| download | nixlib-56ed2e9b1133b0c2a686b0780d1158081e7e6240.tar nixlib-56ed2e9b1133b0c2a686b0780d1158081e7e6240.tar.gz nixlib-56ed2e9b1133b0c2a686b0780d1158081e7e6240.tar.bz2 nixlib-56ed2e9b1133b0c2a686b0780d1158081e7e6240.tar.lz nixlib-56ed2e9b1133b0c2a686b0780d1158081e7e6240.tar.xz nixlib-56ed2e9b1133b0c2a686b0780d1158081e7e6240.tar.zst nixlib-56ed2e9b1133b0c2a686b0780d1158081e7e6240.zip | |
Merge pull request #9010 from rycee/fix/ecj
ecj: require jdk7 instead of jdk (fix build)
| -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. |