diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-03 16:24:37 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-06 14:36:14 +0100 |
| commit | e1f58d2a510b0739de236243c2a1bc7e66233238 (patch) | |
| tree | b1ad45e9544d642bf6a5a720fbcfdc5301d493fe /pkgs/development/eclipse/ecj | |
| parent | 23e277b0dec814768cbaad54f9255d3af342e129 (diff) | |
| download | nixlib-e1f58d2a510b0739de236243c2a1bc7e66233238.tar nixlib-e1f58d2a510b0739de236243c2a1bc7e66233238.tar.gz nixlib-e1f58d2a510b0739de236243c2a1bc7e66233238.tar.bz2 nixlib-e1f58d2a510b0739de236243c2a1bc7e66233238.tar.lz nixlib-e1f58d2a510b0739de236243c2a1bc7e66233238.tar.xz nixlib-e1f58d2a510b0739de236243c2a1bc7e66233238.tar.zst nixlib-e1f58d2a510b0739de236243c2a1bc7e66233238.zip | |
ecj: Build using OpenJDK
Diffstat (limited to 'pkgs/development/eclipse/ecj')
| -rw-r--r-- | pkgs/development/eclipse/ecj/default.nix | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix index 9cc0a778ebcb..7b3940cc2e1e 100644 --- a/pkgs/development/eclipse/ecj/default.nix +++ b/pkgs/development/eclipse/ecj/default.nix @@ -1,11 +1,8 @@ -{ stdenv, fetchurl, unzip, ant, gcj }: +{ stdenv, fetchurl, unzip, ant, jdk }: let version = "3.7.2"; date = "201202080800"; - isGCJ = stdenv.lib.strings.substring 0 3 gcj.name == "gcj"; - javaExec = if isGCJ then "gij" else "java"; - javaFlags = if isGCJ then "--cp" else "-cp"; in stdenv.mkDerivation rec { @@ -16,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm"; }; - buildInputs = [ unzip ant gcj ]; + buildInputs = [ unzip ant jdk ]; unpackPhase = '' mkdir "${name}" @@ -28,16 +25,16 @@ stdenv.mkDerivation rec { buildPhase = "ant build"; installPhase = '' - mkdir -pv "$out/lib/java" - cp -v *.jar "$out/lib/java" + mkdir -pv $out/lib/java + cp -v *.jar $out/lib/java - mkdir -pv "$out/bin" - cat > "$out/bin/ecj" <<EOF -#! /bin/sh -exec "$(type -P ${javaExec})" ${javaFlags} "$out/lib/java/ecj.jar" org.eclipse.jdt.internal.compiler.batch.Main \$@ -EOF + mkdir -pv $out/bin + cat > $out/bin/ecj <<EOF + #! /bin/sh + exec ${jdk.jre}/bin/java -cp $out/lib/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main "\$@" + EOF - chmod u+x "$out/bin/ecj" + chmod u+x $out/bin/ecj ''; meta = { @@ -54,5 +51,7 @@ EOF # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft) license = "EPLv1.0"; + + platforms = stdenv.lib.platforms.linux; }; } |