Cleaning up the java naming conventions

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

6 files changed, 13 insertions, 13 deletions

diff --git a/pkgs/development/tools/build-managers/apache-ant/builder.sh b/pkgs/development/tools/build-managers/apache-ant/builder.sh
index 6a35394749eb..f6fba7275d3d 100644
--- a/pkgs/development/tools/build-managers/apache-ant/builder.sh
+++ b/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"
diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index cbedddcee212..2532db69f97f 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/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 =
diff --git a/pkgs/development/tools/java/jclasslib/builder.sh b/pkgs/development/tools/java/jclasslib/builder.sh
index 56407b376e37..2c9be51476c1 100755
--- a/pkgs/development/tools/java/jclasslib/builder.sh
+++ b/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
diff --git a/pkgs/development/tools/java/jclasslib/default.nix b/pkgs/development/tools/java/jclasslib/default.nix
index f87edb3eab01..dc0d475c4389 100644
--- a/pkgs/development/tools/java/jclasslib/default.nix
+++ b/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];
 }
diff --git a/pkgs/development/tools/misc/swig/builder.sh b/pkgs/development/tools/misc/swig/builder.sh
index d57a2199f737..b4ac1b18a1f5 100644
--- a/pkgs/development/tools/misc/swig/builder.sh
+++ b/pkgs/development/tools/misc/swig/builder.sh
@@ -1,3 +1,3 @@
-buildInputs="$perl $python $j2sdk"
+buildInputs="$perl $python $jdk"
 . $stdenv/setup
 genericBuild
diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix
index 1e14ddc8f299..4cb3f1d0565e 100644
--- a/pkgs/development/tools/misc/swig/default.nix
+++ b/pkgs/development/tools/misc/swig/default.nix
@@ -1,9 +1,9 @@
 { perlSupport, pythonSupport, javaSupport
-, stdenv, fetchurl, perl ? null, python ? null, j2sdk ? null}:
+, stdenv, fetchurl, perl ? null, python ? null, jdk ? null}:
 
 assert perlSupport -> perl != null;
 assert pythonSupport -> python != null;
-assert javaSupport -> j2sdk != null;
+assert javaSupport -> jdk != null;
 
 stdenv.mkDerivation {
   name = "swig-1.3.19";
@@ -18,5 +18,5 @@ stdenv.mkDerivation {
 
   perl = if perlSupport then perl else null;
   python = if pythonSupport then python else null;
-  j2sdk = if javaSupport then j2sdk else null;
+  jdk = if javaSupport then jdk else null;
 }
\ No newline at end of file