Revert "procps-ng: Refactor a bit"

This reverts commit dceff137e107fdbcf13b0d645be48e3cc4256d7f. It was
described as a "refactoring", but actually made procps depend on
systemd (which is a heavy dependency) and changed the name of the
package.
This commit is contained in:
Eelco Dolstra 2015-06-19 14:13:25 +02:00
parent d8c9fa5043
commit fef6141662

View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, ncurses, systemd }: { lib, stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
name = "procps-ng-3.3.10"; name = "procps-3.3.10";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/procps-ng/${name}.tar.xz"; url = mirror://sourceforge/procps-ng/procps-ng-3.3.10.tar.xz;
sha256 = "013z4rzy3p5m1zp6mmynpblv0c6zlcn91pw4k2vymz2djyc6ybm0"; sha256 = "013z4rzy3p5m1zp6mmynpblv0c6zlcn91pw4k2vymz2djyc6ybm0";
}; };
buildInputs = [ pkgconfig ncurses systemd ]; buildInputs = [ ncurses ];
makeFlags = "usrbin_execdir=$(out)/bin"; makeFlags = "usrbin_execdir=$(out)/bin";
@ -19,21 +19,13 @@ stdenv.mkDerivation rec {
}; };
# Too red # Too red
configureFlags = [ configureFlags = [ "--disable-modern-top" ];
"--disable-modern-top"
"--enable-watch8bit"
"--with-systemd"
"--enable-skill"
"--enable-oomem"
"--enable-sigwinch"
];
meta = with stdenv.lib; { meta = {
homepage = http://sourceforge.net/projects/procps-ng/; homepage = http://sourceforge.net/projects/procps-ng/;
description = "Utilities that give information about processes using the /proc filesystem"; description = "Utilities that give information about processes using the /proc filesystem";
priority = 10; # less than coreutils, which also provides "kill" and "uptime" priority = 10; # less than coreutils, which also provides "kill" and "uptime"
maintainers = with maintainers; [ wkennington ]; license = lib.licenses.gpl2;
license = licenses.gpl2; platforms = lib.platforms.linux;
platforms = platforms.linux;
}; };
} }