don't build "kill", update to 3.2.6

svn path=/nixpkgs/trunk/; revision=4363
This commit is contained in:
Armijn Hemel 2005-12-13 15:14:42 +00:00
parent 41047b0fc5
commit 8863466ce7
2 changed files with 16 additions and 4 deletions

View File

@ -1,12 +1,12 @@
{stdenv, fetchurl, ncurses}: {stdenv, fetchurl, ncurses}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "procps-3.2.5"; name = "procps-3.2.6";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://procps.sourceforge.net/procps-3.2.5.tar.gz; url = http://procps.sourceforge.net/procps-3.2.6.tar.gz;
md5 = "cde0e3612d1d7c68f404d46f01c44fb4"; md5 = "7ce39ea27d7b3da0e8ad74dd41d06783";
}; };
patches = [./makefile.patch]; patches = [./makefile.patch ./procps-no-kill.patch];
buildInputs = [ncurses]; buildInputs = [ncurses];
} }

View File

@ -0,0 +1,12 @@
diff -ruN procps-3.2.6/Makefile procps-3.2.6.new/Makefile
--- procps-3.2.6/Makefile 2005-10-30 07:27:04.000000000 +0100
+++ procps-3.2.6.new/Makefile 2005-12-13 16:11:40.000000000 +0100
@@ -43,7 +43,7 @@
usr/lib := $(DESTDIR)/usr/$(lib64)/
usr/include := $(DESTDIR)/usr/include/
-#SKIP := $(bin)kill $(man1)kill.1
+SKIP := $(bin)kill $(man1)kill.1
BINFILES := $(usr/bin)uptime $(usr/bin)tload $(usr/bin)free $(usr/bin)w \
$(usr/bin)top $(usr/bin)vmstat $(usr/bin)watch $(usr/bin)skill \