Cleaning up the java naming conventions

svn path=/nixpkgs/trunk/; revision=3871

pkgs/development/tools/java/jclasslib/builder.sh

@@ -14,9 +14,9 @@ mv build/jclasslib.jar $out/bin/ || exit 1
 cat >> $out/bin/jclasslib <<EOF
 #! /bin/sh
 
-export JAVA_HOME=$j2re
+export JAVA_HOME=$jre
 
-$j2re/bin/java -jar $out/bin/jclasslib.jar \$@
+$jre/bin/java -jar $out/bin/jclasslib.jar \$@
 EOF
 
 chmod a+x $out/bin/jclasslib || exit 1

pkgs/development/tools/java/jclasslib/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, xpf, j2re, ant}:
+{stdenv, fetchurl, xpf, jre, ant}:
 
 stdenv.mkDerivation {
   name = "jclasslib-2.0";
@@ -8,6 +8,6 @@ stdenv.mkDerivation {
     md5 = "31d91bb03fee23410689d2f1c4c439b1";
   };
 
-  inherit j2re xpf ant;
+  inherit jre xpf ant;
   buildInputs = [xpf ant];
 }