diff --git a/pkgs/os-specific/linux/procps/builder.sh b/pkgs/os-specific/linux/procps/builder.sh new file mode 100644 index 000000000000..8549da4267ac --- /dev/null +++ b/pkgs/os-specific/linux/procps/builder.sh @@ -0,0 +1,16 @@ +. $stdenv/setup + +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" +} + +genericBuild + diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix new file mode 100644 index 000000000000..e0cd6fdb9ae5 --- /dev/null +++ b/pkgs/os-specific/linux/procps/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, ncurses}: + +stdenv.mkDerivation { + name = "procps-2.0.11"; + builder = ./builder.sh; + src = fetchurl { + url = http://surriel.com/procps/procps-2.0.11.tar.bz2; + md5 = "8b9464631ebb02f1c2bcda16fb81d62f"; + }; + patches = [./makefile.patch]; + buildInputs = [ncurses]; + inherit ncurses; + # Needed for `sort -n +2' invocation in the Makefile. + _POSIX2_VERSION = "199209"; +} diff --git a/pkgs/os-specific/linux/procps/makefile.patch b/pkgs/os-specific/linux/procps/makefile.patch new file mode 100644 index 000000000000..1a41f4eed2a6 --- /dev/null +++ b/pkgs/os-specific/linux/procps/makefile.patch @@ -0,0 +1,58 @@ +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 +*************** +*** 3,19 **** + + export PREFIX = #proc# prefix for program names + +! 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 ---- + + export PREFIX = #proc# prefix for program names + +! 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 **** + + # 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 ---- + + # 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.~ diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 0f9f3f9eeb04..b71a304a1014 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -739,6 +739,12 @@ rec { ant = apacheAntBlackdown14; }; + /* + mysql = (import ../servers/sql/mysql) { + inherit fetchurl stdenv; + }; + */ + jetty = (import ../servers/http/jetty) { inherit fetchurl stdenv; }; @@ -779,6 +785,10 @@ rec { glibc = stdenv.gcc.glibc; }; + procps = import ../os-specific/linux/procps { + inherit fetchurl stdenv ncurses; + }; + ### DATA