From 5ae438a3e73f93c5d6e5a59e5832c7381d6fa13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 30 Aug 2018 18:01:07 +0200 Subject: [PATCH] procps(-ng): drop the bootstrapping hack On master/staging the bootstrap mistake has been fixed, and it no longer pulls procps, so such a hack isn't required. --- pkgs/os-specific/linux/procps-ng/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index dd269c447df..272812ccb58 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -2,12 +2,8 @@ # `ps` with systemd support is able to properly report different # attributes like unit name, so we want to have it on linux. -# The strange `boostrap` condition is here because `procps` can be -# pulled in to early in bootstrap process, when `stdenv` is not yet -# functional enought to build `systemd` (or its dependencies). -# See https://github.com/NixOS/nixpkgs/pull/43817#issuecomment-408346135 -, withSystemd ? stdenv.isLinux && !(lib.hasPrefix "bootstrap" stdenv.name) -, systemd +, 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