From 144c22b2fe692169d1f6fbd1a29a1fc1a4b2c784 Mon Sep 17 00:00:00 2001
From: Merijn de Jonge <merijn.de.jonge@sorama.eu>
Date: Tue, 4 Apr 2006 13:10:05 +0000
Subject: [PATCH] addid nix expression for toolbus

svn path=/nixpkgs/trunk/; revision=5141
---
 .../interpreters/toolbus/default.nix            | 12 +-----------
 .../interpreters/toolbus/toolbus-1.2.2.nix      | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/interpreters/toolbus/toolbus-1.2.2.nix

diff --git a/pkgs/development/interpreters/toolbus/default.nix b/pkgs/development/interpreters/toolbus/default.nix
index b4812c427208..ca976c0f064e 100644
--- a/pkgs/development/interpreters/toolbus/default.nix
+++ b/pkgs/development/interpreters/toolbus/default.nix
@@ -1,11 +1 @@
-{stdenv, fetchurl, toolbuslib, atermjava, aterm, yacc, flex} :
-
-stdenv.mkDerivation {
-   name = "toolbus-1.2.2";
-   src = fetchurl {
-            url = http://www.cwi.nl/projects/MetaEnv/toolbus/toolbus-1.2.2.tar.gz;
-            md5 = "887349b097006c0883e1948797349a50";
-         };
-   inherit toolbuslib atermjava aterm yacc flex;
-   buildInputs = [toolbuslib atermjava aterm yacc flex];
-}
+import ./toolbus-1.2.2.nix
diff --git a/pkgs/development/interpreters/toolbus/toolbus-1.2.2.nix b/pkgs/development/interpreters/toolbus/toolbus-1.2.2.nix
new file mode 100644
index 000000000000..eb32a93b4bc0
--- /dev/null
+++ b/pkgs/development/interpreters/toolbus/toolbus-1.2.2.nix
@@ -0,0 +1,17 @@
+{javaAdapter ? false,
+ jdk ? null,
+   stdenv, fetchurl, toolbuslib, atermjava, aterm, yacc, flex, tcltk} :
+
+stdenv.mkDerivation {
+   name = "toolbus-1.2.2";
+   builder = ./builder.sh;
+   src = fetchurl {
+            url = http://www.cwi.nl/projects/MetaEnv/toolbus/toolbus-1.2.2.tar.gz;
+            md5 = "887349b097006c0883e1948797349a50";
+         };
+   java = if javaAdapter then true else false;
+   jdk = if javaAdapter then jdk else null;
+
+   inherit toolbuslib atermjava aterm yacc flex tcltk;
+   buildInputs = [toolbuslib atermjava aterm yacc flex jdk tcltk] ;
+}