Cleaning up the java naming conventions

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

pkgs/servers/http/tomcat/builder.sh

@@ -7,7 +7,7 @@ cd jakarta-tomcat*/bin
 
 tar xvfz jsvc.tar.gz
 cd jsvc-src
-sh ./configure --with-java=$sdk
+sh ./configure --with-java=$jdk
 make
 cp jsvc ..
 cd ..

pkgs/servers/http/tomcat/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, j2sdk}:
+{stdenv, fetchurl, jdk}:
 
 stdenv.mkDerivation {
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     md5 = "b802ee042677e284bcf65738c7bdc3b6";
   };
 
-  sdk = j2sdk;
+  inherit jdk;
 }