From 4c70ef7e5dc4e65c989160a54ad104beaa1b10d5 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Sat, 17 Sep 2005 23:58:51 +0000
Subject: Cleaning up the java naming conventions

svn path=/nixpkgs/trunk/; revision=3871
---
 pkgs/development/tools/misc/swig/builder.sh  | 2 +-
 pkgs/development/tools/misc/swig/default.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/development/tools/misc/swig')

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
-- 
cgit 1.4.1