diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-09-17 23:58:51 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-09-17 23:58:51 +0000 |
| commit | 4c70ef7e5dc4e65c989160a54ad104beaa1b10d5 (patch) | |
| tree | c8e0fff64e5565608c717839fa7d25c20d9b6f35 /pkgs/development/eclipse/ecj | |
| parent | 3919e7593ae7feef27c91842a2c49a7539ee7a01 (diff) | |
Cleaning up the java naming conventions
svn path=/nixpkgs/trunk/; revision=3871
Diffstat (limited to 'pkgs/development/eclipse/ecj')
| -rw-r--r-- | pkgs/development/eclipse/ecj/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/development/eclipse/ecj/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/eclipse/ecj/builder.sh b/pkgs/development/eclipse/ecj/builder.sh index 67297e2fd87bc..1b3d86f44a5a7 100644 --- a/pkgs/development/eclipse/ecj/builder.sh +++ b/pkgs/development/eclipse/ecj/builder.sh @@ -12,10 +12,10 @@ mkdir -p $out/bin cat >> $out/bin/ecj <<EOF #! /bin/sh -export JAVA_HOME=$j2re +export JAVA_HOME=$jre export LANG="en_US" -$j2re/bin/java -cp $out/share/ecj/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main \$@ +$jre/bin/java -cp $out/share/ecj/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main \$@ EOF chmod u+x $out/bin/ecj diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix index a0428608d16c0..44e2a1edd0d3f 100644 --- a/pkgs/development/eclipse/ecj/default.nix +++ b/pkgs/development/eclipse/ecj/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, ant, j2re}: +{stdenv, fetchurl, unzip, ant, jre}: stdenv.mkDerivation { name = "ecj-3.1"; @@ -8,6 +8,6 @@ stdenv.mkDerivation { md5 = "19ad65d52005da5eaa1d3687b3a50de2"; }; - inherit j2re; - buildInputs = [unzip ant j2re]; + inherit jre; + buildInputs = [unzip ant jre]; } |