b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

procps(-ng): drop the bootstrapping hack

Browse source 
On master/staging the bootstrap mistake has been fixed,
and it no longer pulls procps, so such a hack isn't required.
This commit is contained in:
Vladimír Čunát 2018-08-30 18:01:07 +02:00
parent 86b097432a
commit 5ae438a3e7
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/os-specific/linux/procps-ng/default.nix
View file

@ -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