ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9010 from rycee/fix/ecj

Browse Source 
ecj: require jdk7 instead of jdk (fix build)
This commit is contained in:
William A. Kennington III 2015-07-27 15:50:11 -04:00
commit 56ed2e9b11
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
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.