diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-30 18:01:07 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-30 18:01:07 +0200 |
| commit | 5ae438a3e73f93c5d6e5a59e5832c7381d6fa13e (patch) | |
| tree | 8bb375334922ccb62120cd7c2cd25c654c1a27b3 /pkgs/os-specific/linux/procps-ng | |
| parent | 86b097432aef616552715f3f2ef6d183aee6da22 (diff) | |
| download | nixlib-5ae438a3e73f93c5d6e5a59e5832c7381d6fa13e.tar nixlib-5ae438a3e73f93c5d6e5a59e5832c7381d6fa13e.tar.gz nixlib-5ae438a3e73f93c5d6e5a59e5832c7381d6fa13e.tar.bz2 nixlib-5ae438a3e73f93c5d6e5a59e5832c7381d6fa13e.tar.lz nixlib-5ae438a3e73f93c5d6e5a59e5832c7381d6fa13e.tar.xz nixlib-5ae438a3e73f93c5d6e5a59e5832c7381d6fa13e.tar.zst nixlib-5ae438a3e73f93c5d6e5a59e5832c7381d6fa13e.zip | |
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.
Diffstat (limited to 'pkgs/os-specific/linux/procps-ng')
| -rw-r--r-- | pkgs/os-specific/linux/procps-ng/default.nix | 8 |
1 files 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 dd269c447df8..272812ccb588 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 |