From 63993b0c9bc3aa71f513196a9e47224bf8981e99 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 1 Mar 2010 16:40:02 +0000 Subject: [PATCH] ecj darwin~ svn path=/nixpkgs/trunk/; revision=20312 --- pkgs/development/eclipse/ecj/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix index f463dd051684..cf82b76fb471 100644 --- a/pkgs/development/eclipse/ecj/default.nix +++ b/pkgs/development/eclipse/ecj/default.nix @@ -3,6 +3,9 @@ let version = "3.5.1"; date = "200909170800"; + 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 { name = "ecj-${version}"; @@ -30,7 +33,7 @@ in mkdir -pv "$out/bin" cat > "$out/bin/ecj" <