From f4c4a4cc1bcdf163be1c54ee477624f51574136c Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 8 Jul 2018 13:42:21 -0400 Subject: watch: remove This can be built in the procps-ng/default.nix expression. --- pkgs/os-specific/linux/procps-ng/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/procps-ng') diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index bd69145521c..ad9f7191151 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; nativeBuildInputs = [ pkgconfig ]; - makeFlags = "usrbin_execdir=$(out)/bin"; + makeFlags = [ "usrbin_execdir=$(out)/bin" ] + ++ lib.optionals stdenv.isDarwin [ "watch" "PKG_LDFLAGS="]; enableParallelBuilding = true; @@ -23,12 +24,17 @@ stdenv.mkDerivation rec { [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; + installPhase = if stdenv.isDarwin then '' + install -m 0755 -D watch $out/bin/watch + install -m 0644 -D watch.1 $out/share/man/man1/watch.1 + '' else null; + meta = { homepage = https://gitlab.com/procps-ng/procps; description = "Utilities that give information about processes using the /proc filesystem"; priority = 10; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; - platforms = lib.platforms.linux ++ lib.platforms.cygwin; + platforms = lib.platforms.linux ++ lib.platforms.cygwin ++ lib.platforms.darwin; maintainers = [ lib.maintainers.typetetris ]; }; } -- cgit 1.4.1