From 5d6d6a593063995baff18674858d0169b3b15156 Mon Sep 17 00:00:00 2001
From: Merijn de Jonge <merijn.de.jonge@sorama.eu>
Date: Fri, 3 Feb 2006 09:08:26 +0000
Subject: [PATCH] used buildInputs to remove need for special builder scripts

svn path=/nixpkgs/trunk/; revision=4684
---
 pkgs/development/interpreters/toolbus/builder.sh  | 9 ---------
 pkgs/development/interpreters/toolbus/default.nix | 2 +-
 pkgs/development/libraries/toolbuslib/builder.sh  | 9 ---------
 pkgs/development/libraries/toolbuslib/default.nix | 2 +-
 4 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/interpreters/toolbus/builder.sh
 delete mode 100644 pkgs/development/libraries/toolbuslib/builder.sh

diff --git a/pkgs/development/interpreters/toolbus/builder.sh b/pkgs/development/interpreters/toolbus/builder.sh
deleted file mode 100644
index ecec00e817c..00000000000
--- a/pkgs/development/interpreters/toolbus/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-PATH=$aterm/bin:$atermjava/bin:$toolbuslib/bin:$yacc/bin:$flex/bin:$PATH
-
-tar xvfz $src
-cd toolbus-*
-./configure --prefix=$out
-make
-make install
diff --git a/pkgs/development/interpreters/toolbus/default.nix b/pkgs/development/interpreters/toolbus/default.nix
index 3e55ad9bb51..b4812c42720 100644
--- a/pkgs/development/interpreters/toolbus/default.nix
+++ b/pkgs/development/interpreters/toolbus/default.nix
@@ -2,10 +2,10 @@
 
 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";
          };
    inherit toolbuslib atermjava aterm yacc flex;
+   buildInputs = [toolbuslib atermjava aterm yacc flex];
 }
diff --git a/pkgs/development/libraries/toolbuslib/builder.sh b/pkgs/development/libraries/toolbuslib/builder.sh
deleted file mode 100644
index 062e1693b94..00000000000
--- a/pkgs/development/libraries/toolbuslib/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-PATH=$aterm/bin:$PATH
-set
-tar xvfz $src
-cd toolbuslib-*
-./configure --prefix=$out
-make
-make install
diff --git a/pkgs/development/libraries/toolbuslib/default.nix b/pkgs/development/libraries/toolbuslib/default.nix
index 451efd55173..0f187db8b20 100644
--- a/pkgs/development/libraries/toolbuslib/default.nix
+++ b/pkgs/development/libraries/toolbuslib/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation {
 name = "toolbuslib-0.7.2";
-builder = ./builder.sh;
 src = fetchurl {
          url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.7.2.tar.gz;
          md5 = "6619a155c6326d728d53c6901558e350";
    };
 inherit aterm;
+buildinputs = [aterm];
 }