Skip to content

Commit

Permalink
procps(-ng): drop the bootstrapping hack
Browse files Browse the repository at this point in the history
On master/staging the bootstrap mistake has been fixed,
and it no longer pulls procps, so such a hack isn't required.
  • Loading branch information
vcunat committed Aug 30, 2018
1 parent 86b0974 commit 5ae438a
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions pkgs/os-specific/linux/procps-ng/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5ae438a

Please sign in to comment.