public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #43817: procps(-ng): enable systemd support

Browse Source 
The whole closure only grows by 5 MiB roughly,
and it's all very common libraries (very low practical impact).
This commit is contained in:
Vladimír Čunát 2018-08-30 18:03:14 +02:00
commit 2a39174255
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/procps-ng/default.nix
View File

@ -1,10 +1,16 @@
{ lib, stdenv, fetchurl, ncurses, pkgconfig { lib, stdenv, fetchurl, ncurses, pkgconfig
# `ps` with systemd support is able to properly report different
# attributes like unit name, so we want to have it on linux.
, withSystemd ? stdenv.isLinux
, systemd ? null
# 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)
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "procps-${version}"; name = "procps-${version}";
@ -16,7 +22,8 @@ stdenv.mkDerivation rec {
sha256 = "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h"; sha256 = "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h";
}; };
buildInputs = [ ncurses ]; buildInputs = [ ncurses ]
++ lib.optional withSystemd systemd;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
makeFlags = [ "usrbin_execdir=$(out)/bin" ] makeFlags = [ "usrbin_execdir=$(out)/bin" ]
@ -26,6 +33,7 @@ stdenv.mkDerivation rec {
# Too red # Too red
configureFlags = [ "--disable-modern-top" ] configureFlags = [ "--disable-modern-top" ]
++ 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" ];