watch: remove

This can be built in the procps-ng/default.nix expression.
This commit is contained in:
Matthew Bauer 2018-07-08 13:42:21 -04:00
parent 6eb508a3e8
commit f4c4a4cc1b
3 changed files with 8 additions and 29 deletions

View file

@ -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 ];
};
}

View file

@ -1,25 +0,0 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation {
name = "watch-0.2.0";
src = fetchurl {
url = http://procps.sourceforge.net/procps-3.2.8.tar.gz;
sha256 = "0d8mki0q4yamnkk4533kx8mc0jd879573srxhg6r2fs3lkc6iv8i";
};
buildInputs = [ ncurses ];
makeFlags = "watch usrbin_execdir=$(out)/bin" +
(if stdenv.isDarwin then " PKG_LDFLAGS=" else "");
enableParallelBuilding = true;
installPhase = "mkdir $out; mkdir -p $out/bin; cp -p watch $out/bin";
meta = {
homepage = https://sourceforge.net/projects/procps/;
description = "Utility for watch the output of a given command at intervals";
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -14226,8 +14226,6 @@ with pkgs;
procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
else unixtools.procps;
watch = callPackage ../os-specific/linux/procps/watch.nix { };
qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
# See `xenPackages` source for explanations.