From 923dda992bcf629e8301beec7f04dfbbd40bb0e9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 26 Jul 2015 23:34:06 +0200
Subject: 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.
---
 pkgs/development/eclipse/ecj/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/development')

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.
-- 
cgit 1.4.1