b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

* Ugh, the procps at surriel was ancient. Updated to 3.2.4.

Browse source 
svn path=/nixpkgs/trunk/; revision=2081
This commit is contained in:
Eelco Dolstra 2005-01-21 18:35:06 +00:00
parent bd4b67cf1f
commit e03984abda
3 changed files with 67 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/os-specific/linux/procps/builder.sh
View file

@ -2,15 +2,7 @@
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$ncurses/include/ncurses"
preInstall=preInstall
preInstall() {
ensureDir "$prefix/bin"
ensureDir "$prefix/sbin"
ensureDir "$prefix/lib"
ensureDir "$prefix/share/man/man1"
ensureDir "$prefix/share/man/man5"
ensureDir "$prefix/share/man/man8"
}
export DESTDIR=$out
genericBuild

8
pkgs/os-specific/linux/procps/default.nix
View file

@ -1,15 +1,13 @@
{stdenv, fetchurl, ncurses}:
stdenv.mkDerivation {
name = "procps-2.0.11";
name = "procps-3.2.4";
builder = ./builder.sh;
src = fetchurl {
url = http://surriel.com/procps/procps-2.0.11.tar.bz2;
md5 = "8b9464631ebb02f1c2bcda16fb81d62f";
url = http://procps.sourceforge.net/procps-3.2.4.tar.gz;
md5 = "1bec6740b385b3f73800827437f14f85";
};
patches = [./makefile.patch];
buildInputs = [ncurses];
inherit ncurses;
# Needed for `sort -n +2' invocation in the Makefile.
_POSIX2_VERSION = "199209";
}

113
pkgs/os-specific/linux/procps/makefile.patch
View file

@ -1,58 +1,71 @@
diff -rc procps-orig/Makefile procps-2.0.11/Makefile
*** procps-orig/Makefile 2002-12-04 21:49:07.000000000 +0100
--- procps-2.0.11/Makefile 2005-01-21 19:20:41.092274872 +0100
diff -rc procps-orig/Makefile procps-3.2.4/Makefile
*** procps-orig/Makefile 2004-10-10 23:31:12.000000000 +0200
--- procps-3.2.4/Makefile 2005-01-21 19:33:49.700437229 +0100
***************
*** 3,19 ****
*** 24,47 ****
############ vars
export PREFIX = #proc# prefix for program names
# so you can disable them or choose alternates
! ldconfig := ldconfig
ln_f := ln -f
ln_sf := ln -sf
! install := install -D --owner 0 --group 0
! export DESTDIR =
! export MANDIR = /usr/share/man
export MAN1DIR = $(DESTDIR)$(MANDIR)/man1
export MAN5DIR = $(DESTDIR)$(MANDIR)/man5
export MAN8DIR = $(DESTDIR)$(MANDIR)/man8
export BINDIR = $(DESTDIR)/bin
export SBINDIR = $(DESTDIR)/sbin
! export XBINDIR = $(DESTDIR)/usr/X11R6/bin
! export USRBINDIR = $(DESTDIR)/usr/bin
! export PROCDIR = $(DESTDIR)/usr/bin# /usr/proc/bin for Solaris devotees
! export OWNERGROUP = --owner 0 --group 0
export INSTALLBIN = install --strip
export INSTALLLIB = install
export INSTALLSCT = install
--- 3,19 ----
# Lame x86-64 /lib64 and /usr/lib64 abomination:
lib64 := lib$(shell [ -d /lib64 ] && echo 64)
export PREFIX = #proc# prefix for program names
! usr/bin := $(DESTDIR)/usr/bin/
bin := $(DESTDIR)/bin/
sbin := $(DESTDIR)/sbin/
! usr/proc/bin := $(DESTDIR)/usr/bin/
! man1 := $(DESTDIR)/usr/share/man/man1/
! man5 := $(DESTDIR)/usr/share/man/man5/
! man8 := $(DESTDIR)/usr/share/man/man8/
! lib := $(DESTDIR)/$(lib64)/
! usr/lib := $(DESTDIR)/usr/$(lib64)/
! usr/include := $(DESTDIR)/usr/include/
#SKIP := $(bin)kill $(man1)kill.1
--- 24,47 ----
############ vars
# so you can disable them or choose alternates
! ldconfig := true
ln_f := ln -f
ln_sf := ln -sf
! install := install -D
# Lame x86-64 /lib64 and /usr/lib64 abomination:
lib64 := lib$(shell [ -d /lib64 ] && echo 64)
! usr/bin := $(DESTDIR)/bin/
bin := $(DESTDIR)/bin/
sbin := $(DESTDIR)/sbin/
! usr/proc/bin := $(DESTDIR)/bin/
! man1 := $(DESTDIR)/share/man/man1/
! man5 := $(DESTDIR)/share/man/man5/
! man8 := $(DESTDIR)/share/man/man8/
! lib := $(DESTDIR)/lib/
! usr/lib := $(DESTDIR)/lib/
! usr/include := $(DESTDIR)/include/
#SKIP := $(bin)kill $(man1)kill.1
! export DESTDIR = $(out)
! export MANDIR = /share/man
export MAN1DIR = $(DESTDIR)$(MANDIR)/man1
export MAN5DIR = $(DESTDIR)$(MANDIR)/man5
export MAN8DIR = $(DESTDIR)$(MANDIR)/man8
export BINDIR = $(DESTDIR)/bin
export SBINDIR = $(DESTDIR)/sbin
! export XBINDIR = $(DESTDIR)/bin
! export USRBINDIR = $(DESTDIR)/bin
! export PROCDIR = $(DESTDIR)/bin# /usr/proc/bin for Solaris devotees
! export OWNERGROUP =
export INSTALLBIN = install --strip
export INSTALLLIB = install
export INSTALLSCT = install
***************
*** 30,36 ****
*** 71,77 ****
# easy to command-line override
export GCC_WARN = -Wall -Wstrict-prototypes -Wshadow
! export INCDIRS = -I/usr/include/ncurses -I/usr/X11R6/include
export CC = gcc #-ggdb # this gets compiling and linking :-)
export OPT = -O3
export CFLAGS = -D_GNU_SOURCE $(OPT) $(GCC_WARN) -I$(shell pwd) $(INCDIRS)
--- 30,36 ----
# Preprocessor flags.
PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
! CPPFLAGS := -I/usr/include/ncurses
ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS)
# easy to command-line override
export GCC_WARN = -Wall -Wstrict-prototypes -Wshadow
! export INCDIRS =
export CC = gcc #-ggdb # this gets compiling and linking :-)
export OPT = -O3
export CFLAGS = -D_GNU_SOURCE $(OPT) $(GCC_WARN) -I$(shell pwd) $(INCDIRS)
Only in procps-2.0.11/: Makefile.~1.71.~
# Left out -Wconversion due to noise in glibc headers.
--- 71,77 ----
# Preprocessor flags.
PKG_CPPFLAGS := -D_GNU_SOURCE -I proc
! CPPFLAGS :=
ALL_CPPFLAGS := $(PKG_CPPFLAGS) $(CPPFLAGS)
# Left out -Wconversion due to noise in glibc headers.