From b5edfc05dc37d7a4eaca0f52859d9d7533b3c83f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 May 2007 14:27:23 +0000 Subject: [PATCH] * Build a variant "sysvtools" of sysvinit which doesn't contain the actual init programs, just some utilities (notably last, wall, mesg). svn path=/nixpkgs/trunk/; revision=8737 --- pkgs/os-specific/linux/sysvinit/builder.sh | 12 ++++++++++++ pkgs/os-specific/linux/sysvinit/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 5 +++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysvinit/builder.sh b/pkgs/os-specific/linux/sysvinit/builder.sh index ce5119d2b6a..48574d6ec3e 100644 --- a/pkgs/os-specific/linux/sysvinit/builder.sh +++ b/pkgs/os-specific/linux/sysvinit/builder.sh @@ -18,4 +18,16 @@ preInstall() { mkdir $out/share/man/man8 } +postInstall=postInstall +postInstall() { + if test -n "$withoutInitTools"; then + mv $out/sbin/killall5 $out/bin + ln -sf killall5 $out/bin/pidof + rm -rf $out/sbin + rm -rf $out/include + rm -rf $out/share/man/man5 + rm -rf $out/share/man/man8 + fi +} + genericBuild diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 27d438345fa..8d71daf0741 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -1,11 +1,12 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, withoutInitTools ? false}: stdenv.mkDerivation { - name = "sysvinit-2.86"; + name = if withoutInitTools then "sysvtools-2.86" else "sysvinit-2.86"; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.86.tar.gz; sha256 = "1n3rnsynlaw7zyp2q5r7c49yvi1xr3669ick540gz73xw7x9hpq3"; }; patches = [./sysvinit-2.85-exec.patch]; + inherit withoutInitTools; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bd87c1fbe5..589231f2d09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2418,6 +2418,11 @@ rec { inherit fetchurl stdenv; }; + sysvtools = import ../os-specific/linux/sysvinit { + inherit fetchurl stdenv; + withoutInitTools = true; + }; + udev = import ../os-specific/linux/udev { inherit fetchurl stdenv; };