From fef61416624724600b74cf7dc30f16e5fce959e6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Jun 2015 14:13:25 +0200 Subject: [PATCH] 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. --- pkgs/os-specific/linux/procps-ng/default.nix | 26 +++++++------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 9ecc0c5bcb57..7a810e9fff97 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, pkgconfig, ncurses, systemd }: +{ lib, stdenv, fetchurl, ncurses }: -stdenv.mkDerivation rec { - name = "procps-ng-3.3.10"; +stdenv.mkDerivation { + name = "procps-3.3.10"; src = fetchurl { - url = "mirror://sourceforge/procps-ng/${name}.tar.xz"; + url = mirror://sourceforge/procps-ng/procps-ng-3.3.10.tar.xz; sha256 = "013z4rzy3p5m1zp6mmynpblv0c6zlcn91pw4k2vymz2djyc6ybm0"; }; - buildInputs = [ pkgconfig ncurses systemd ]; + buildInputs = [ ncurses ]; makeFlags = "usrbin_execdir=$(out)/bin"; @@ -19,21 +19,13 @@ stdenv.mkDerivation rec { }; # Too red - configureFlags = [ - "--disable-modern-top" - "--enable-watch8bit" - "--with-systemd" - "--enable-skill" - "--enable-oomem" - "--enable-sigwinch" - ]; + configureFlags = [ "--disable-modern-top" ]; - meta = with stdenv.lib; { + meta = { 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.gpl2; - platforms = platforms.linux; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; }