Cleaning up the java naming conventions

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

pkgs/development/tools/build-managers/apache-ant/builder.sh

@@ -5,8 +5,8 @@ mkdir -p $out/bin || exit 1
 cat >> $out/bin/ant <<EOF
 #! /bin/sh
 
-export JAVA_HOME=$j2sdk
-export JAVACMD=$j2sdk/bin/java
+export JAVA_HOME=$jdk
+export JAVACMD=$jdk/bin/java
 export ANT_OPTS=""
 export ANT_ARGS=""
 export LANG="en_US"

pkgs/development/tools/build-managers/apache-ant/default.nix

@@ -1,12 +1,12 @@
-{stdenv, fetchurl, j2sdk, name}:
+{stdenv, fetchurl, jdk, name}:
 
 let {
   body =
     stdenv.mkDerivation {
       name = name;
       builder = ./builder.sh;
-      buildInputs = [ant j2sdk];
-      inherit ant j2sdk;
+      buildInputs = [ant jdk];
+      inherit ant jdk;
     };
 
   ant =