From dceff137e107fdbcf13b0d645be48e3cc4256d7f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Mar 2015 11:15:49 -0700 Subject: [PATCH] procps-ng: Refactor a bit --- pkgs/os-specific/linux/procps-ng/default.nix | 24 ++++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index bfcb99b7e78a..4018e65f3f72 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, ncurses }: +{ stdenv, fetchurl, pkgconfig, ncurses, systemd }: -stdenv.mkDerivation { - name = "procps-3.3.10"; +stdenv.mkDerivation rec { + name = "procps-ng-3.3.10"; src = fetchurl { - url = mirror://sourceforge/procps-ng/procps-ng-3.3.10.tar.xz; + url = "mirror://sourceforge/procps-ng/${name}.tar.xz"; sha256 = "013z4rzy3p5m1zp6mmynpblv0c6zlcn91pw4k2vymz2djyc6ybm0"; }; - buildInputs = [ ncurses ]; + buildInputs = [ pkgconfig ncurses systemd ]; makeFlags = "usrbin_execdir=$(out)/bin"; @@ -19,11 +19,21 @@ stdenv.mkDerivation { }; # Too red - configureFlags = [ "--disable-modern-top" ]; + configureFlags = [ + "--disable-modern-top" + "--enable-watch8bit" + "--with-systemd" + "--enable-skill" + "--enable-oomem" + "--enable-sigwinch" + ]; - meta = { + meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/procps-ng/; description = "Utilities that give information about processes using the /proc filesystem"; priority = 10; # less than coreutils, which also provides "kill" and "uptime" + maintainers = with maintainers; [ wkennington ]; + license = licenses.gpl; + platforms = platforms.linux; }; }