diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-08 13:42:21 -0400 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-09 11:59:32 -0400 |
commit | f4c4a4cc1bcdf163be1c54ee477624f51574136c (patch) | |
tree | 7ec223c19a48af0fd523911ccdfbc96cedcc3be6 /pkgs/os-specific | |
parent | 6eb508a3e86e5f1a6b38b0db9e6bf1a84c17e9b9 (diff) | |
download | nixpkgs-f4c4a4cc1bcdf163be1c54ee477624f51574136c.tar nixpkgs-f4c4a4cc1bcdf163be1c54ee477624f51574136c.tar.gz nixpkgs-f4c4a4cc1bcdf163be1c54ee477624f51574136c.tar.bz2 nixpkgs-f4c4a4cc1bcdf163be1c54ee477624f51574136c.tar.lz nixpkgs-f4c4a4cc1bcdf163be1c54ee477624f51574136c.tar.xz nixpkgs-f4c4a4cc1bcdf163be1c54ee477624f51574136c.tar.zst nixpkgs-f4c4a4cc1bcdf163be1c54ee477624f51574136c.zip |
watch: remove
This can be built in the procps-ng/default.nix expression.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/procps-ng/default.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/procps/watch.nix | 25 |
2 files changed, 8 insertions, 27 deletions
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 ]; }; } diff --git a/pkgs/os-specific/linux/procps/watch.nix b/pkgs/os-specific/linux/procps/watch.nix deleted file mode 100644 index 4511b9cf843..00000000000 --- a/pkgs/os-specific/linux/procps/watch.nix +++ /dev/null @@ -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; - }; -} |