diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-30 18:03:14 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-30 18:03:59 +0200 |
commit | 2a391742555c2fea413289f31f1308d12ebdb454 (patch) | |
tree | 1c6721f3e85f75caa1c96f0032e88f82d8ea0e21 | |
parent | b71b222b4cce67af6c0d305f5bf735f83239b93e (diff) | |
parent | 5ae438a3e73f93c5d6e5a59e5832c7381d6fa13e (diff) | |
download | nixlib-2a391742555c2fea413289f31f1308d12ebdb454.tar nixlib-2a391742555c2fea413289f31f1308d12ebdb454.tar.gz nixlib-2a391742555c2fea413289f31f1308d12ebdb454.tar.bz2 nixlib-2a391742555c2fea413289f31f1308d12ebdb454.tar.lz nixlib-2a391742555c2fea413289f31f1308d12ebdb454.tar.xz nixlib-2a391742555c2fea413289f31f1308d12ebdb454.tar.zst nixlib-2a391742555c2fea413289f31f1308d12ebdb454.zip |
Merge #43817: procps(-ng): enable systemd support
The whole closure only grows by 5 MiB roughly, and it's all very common libraries (very low practical impact).
-rw-r--r-- | pkgs/os-specific/linux/procps-ng/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 7f1e93c072da..272812ccb588 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -1,10 +1,16 @@ { 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 # system (or very similar like that found in Cygwin). The one # exception is ‘watch’ which is portable enough to run on pretty much # any UNIX-compatible system. -, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin) }: +, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin) +}: stdenv.mkDerivation rec { name = "procps-${version}"; @@ -16,7 +22,8 @@ stdenv.mkDerivation rec { sha256 = "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h"; }; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses ] + ++ lib.optional withSystemd systemd; nativeBuildInputs = [ pkgconfig ]; makeFlags = [ "usrbin_execdir=$(out)/bin" ] @@ -26,6 +33,7 @@ stdenv.mkDerivation rec { # Too red configureFlags = [ "--disable-modern-top" ] + ++ lib.optional withSystemd "--with-systemd" ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes" ]; |