philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

procps-ng: cleanup, format, remove ? null from inputs

Browse source
This commit is contained in:
Sandro Jäckel 2021-03-11 00:10:06 +01:00 committed by github-actions[bot]
parent 5b3290333a
commit 152114997f
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
pkgs/os-specific/linux/procps-ng/default.nix
View file

@ -1,14 +1,19 @@
{ lib, stdenv, fetchurl, fetchpatch, ncurses, pkg-config { lib
, stdenv
, fetchurl
, fetchpatch
, ncurses
, pkg-config
# `ps` with systemd support is able to properly report different # `ps` with systemd support is able to properly report different
# attributes like unit name, so we want to have it on linux. # attributes like unit name, so we want to have it on linux.
, withSystemd ? stdenv.isLinux , withSystemd ? stdenv.isLinux
, systemd ? null , systemd
# procps is mostly Linux-only. Most commands require a running Linux # procps is mostly Linux-only. Most commands require a running Linux
# system (or very similar like that found in Cygwin). The one # system (or very similar like that found in Cygwin). The one
# exception is ‘watch’ which is portable enough to run on pretty much # exception is ‘watch’ which is portable enough to run on pretty much
# any UNIX-compatible system. # any UNIX-compatible system.
, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin) , watchOnly ? !(stdenv.isLinux || stdenv.isCygwin)
}: }:
@ -35,28 +40,29 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
makeFlags = [ "usrbin_execdir=$(out)/bin" ] makeFlags = [ "usrbin_execdir=$(out)/bin" ]
++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS="]; ++ lib.optionals watchOnly [ "watch" "PKG_LDFLAGS=" ];
enableParallelBuilding = true; enableParallelBuilding = true;
# Too red # Too red
configureFlags = [ "--disable-modern-top" ] configureFlags = [ "--disable-modern-top" ]
++ lib.optional withSystemd "--with-systemd" ++ lib.optional withSystemd "--with-systemd"
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
[ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes" ]; "ac_cv_func_realloc_0_nonnull=yes"
];
installPhase = if watchOnly then '' installPhase = lib.optionalString watchOnly ''
install -m 0755 -D watch $out/bin/watch install -m 0755 -D watch $out/bin/watch
install -m 0644 -D watch.1 $out/share/man/man1/watch.1 install -m 0644 -D watch.1 $out/share/man/man1/watch.1
'' else null; '';
meta = { meta = with lib; {
homepage = "https://gitlab.com/procps-ng/procps"; homepage = "https://gitlab.com/procps-ng/procps";
description = "Utilities that give information about processes using the /proc filesystem"; description = "Utilities that give information about processes using the /proc filesystem";
priority = 11; # less than coreutils, which also provides "kill" and "uptime" priority = 11; # less than coreutils, which also provides "kill" and "uptime"
license = lib.licenses.gpl2; license = licenses.gpl2;
platforms = lib.platforms.unix; platforms = platforms.unix;
maintainers = [ lib.maintainers.typetetris ]; maintainers = [ maintainers.typetetris ];
}; };
} }