Cleaning up the java naming conventions

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

pkgs/development/libraries/java/cup/builder.sh

@@ -3,8 +3,8 @@ set -e
 
 tar zxvf $src
 
-$j2sdk/bin/javac java_cup/*.java
-$j2sdk/bin/javac java_cup/runtime/*.java
+$jdk/bin/javac java_cup/*.java
+$jdk/bin/javac java_cup/runtime/*.java
 
 mkdir -p $out/java_cup/runtime
 

pkgs/development/libraries/java/cup/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, j2sdk} :
+{stdenv, fetchurl, jdk} :
 
 stdenv.mkDerivation {
   name = "java-cup-10k";
@@ -9,5 +9,5 @@ stdenv.mkDerivation {
     md5 = "8b11edfec13c590ea443d0f0ae0da479";
   };
 
-  inherit j2sdk;
+  inherit jdk;
 }