From de62b313252c42baec203efbbec0682b82fcbf9a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 3 Sep 2025 13:12:41 +0200 Subject: [PATCH] procps: use `lib.optionals` --- pkgs/os-specific/linux/procps-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 124799035976..f162cf0cfd00 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IocNb+skeK22F85PCaeHrdry0mDFqKp7F9iJqWLF5C4="; }; - buildInputs = [ ncurses ] ++ lib.optional withSystemd systemd; + buildInputs = [ ncurses ] ++ lib.optionals withSystemd [ systemd ]; nativeBuildInputs = [ pkg-config autoreconfHook @@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: { "--disable-modern-top" "--enable-watch8bit" ] - ++ lib.optional withSystemd "--with-systemd" - ++ lib.optional stdenv.hostPlatform.isMusl "--disable-w" + ++ lib.optionals withSystemd [ "--with-systemd" ] + ++ lib.optionals stdenv.hostPlatform.isMusl [ "--disable-w" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_func_malloc_0_nonnull=yes" "ac_cv_func_realloc_0_nonnull=yes"