From 41c7e3457b005ae0aacc0d3c2ad1ee4fd17bcbc4 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 18 Oct 2005 21:25:57 +0000
Subject: rewrite old builder to new style builder (long overdue!)

svn path=/nixpkgs/trunk/; revision=4103
---
 pkgs/os-specific/linux/sysvinit/builder.sh  | 17 ++++++++++++-----
 pkgs/os-specific/linux/sysvinit/default.nix |  3 ++-
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'pkgs/os-specific/linux/sysvinit')

diff --git a/pkgs/os-specific/linux/sysvinit/builder.sh b/pkgs/os-specific/linux/sysvinit/builder.sh
index ed32068532b..76927bccda4 100644
--- a/pkgs/os-specific/linux/sysvinit/builder.sh
+++ b/pkgs/os-specific/linux/sysvinit/builder.sh
@@ -1,11 +1,13 @@
-buildinputs="$patch"
-. $stdenv/setup
+source $stdenv/setup
 
-tar xvfz $src
-cd sysvinit-*
-patch -p1 < $srcPatch
+buildPhase() {
 cd src
 make
+}
+
+buildPhase=buildPhase
+
+installPhase() {
 mkdir $out
 mkdir $out/bin
 mkdir $out/sbin
@@ -16,3 +18,8 @@ mkdir $out/share/man/man1
 mkdir $out/share/man/man5
 mkdir $out/share/man/man8
 make ROOT=$out install
+}
+
+installPhase=installPhase
+
+genericBuild
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index 44932682631..71697bb825d 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -7,5 +7,6 @@ stdenv.mkDerivation {
     url = http://nix.cs.uu.nl/dist/tarballs/sysvinit-2.85.tar.gz;
     md5 = "8a2d8f1ed5a2909da04132fefa44905e";
   };
-  srcPatch = ./patch;
+  #srcPatch = ./patch;
+  patches = [./patch];
 }
-- 
cgit 1.4.1