From 86b097432aef616552715f3f2ef6d183aee6da22 Mon Sep 17 00:00:00 2001
From: Alexey Lebedeff <binarin@binarin.ru>
Date: Fri, 27 Jul 2018 10:41:42 +0200
Subject: [PATCH 1/2] procps: enable systemd support when available

`ps` can show various systemd-related information, like a unit to
which a process belongs. But when it's not compiled it, it shows only
'?' in such fields.

Can be tested with:

    ps -o unit= ax
---
 pkgs/os-specific/linux/procps-ng/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 7f1e93c072d..dd269c447df 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,10 +1,20 @@
 { lib, stdenv, fetchurl, ncurses, pkgconfig
 
+# `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
+
 # procps is mostly Linux-only. Most commands require a running Linux
 # system (or very similar like that found in Cygwin). The one
 # exception is ‘watch’ which is portable enough to run on pretty much
 # any UNIX-compatible system.
-, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin) }:
+, watchOnly ? !(stdenv.isLinux || stdenv.isCygwin)
+}:
 
 stdenv.mkDerivation rec {
   name = "procps-${version}";
@@ -16,7 +26,8 @@ stdenv.mkDerivation rec {
     sha256 = "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h";
   };
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses ]
+    ++ lib.optional withSystemd systemd;
   nativeBuildInputs = [ pkgconfig ];
 
   makeFlags = [ "usrbin_execdir=$(out)/bin" ]
@@ -26,6 +37,7 @@ stdenv.mkDerivation rec {
 
   # Too red
   configureFlags = [ "--disable-modern-top" ]
+    ++ lib.optional withSystemd "--with-systemd"
     ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
     [ "ac_cv_func_malloc_0_nonnull=yes"
       "ac_cv_func_realloc_0_nonnull=yes" ];

From 5ae438a3e73f93c5d6e5a59e5832c7381d6fa13e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 30 Aug 2018 18:01:07 +0200
Subject: [PATCH 2/2] 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