From 8eb8c98b444f87cd53d2140aa7b80e012aeaf7c1 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 17 Feb 2021 22:13:25 +0100
Subject: [PATCH] Fix problem with essential missing base packages when a PATH
 is provided

---
 nixproc/backends/s6-rc/generate-s6-rc-service.nix          | 7 +++++--
 .../universal/create-managed-process-universal.nix         | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixproc/backends/s6-rc/generate-s6-rc-service.nix b/nixproc/backends/s6-rc/generate-s6-rc-service.nix
index ea1835c..2f2eb48 100644
--- a/nixproc/backends/s6-rc/generate-s6-rc-service.nix
+++ b/nixproc/backends/s6-rc/generate-s6-rc-service.nix
@@ -1,4 +1,4 @@
-{ s6-rc, stdenv, writeTextFile, execline, tmpDir, runtimeDir, forceDisableUserChange }:
+{ s6, s6-rc, basePackages, stdenv, writeTextFile, execline, tmpDir, runtimeDir, forceDisableUserChange }:
 
 { name
 , description
@@ -26,8 +26,11 @@ let
     inherit (stdenv) lib;
   };
 
+  s6-rcBasePackages = basePackages ++ [ execline s6 ];
+
   _environment = util.appendPathToEnvironment {
-    inherit environment path;
+    inherit environment;
+    path = s6-rcBasePackages ++ path;
   };
 
   _user = util.determineUser {
diff --git a/nixproc/create-managed-process/universal/create-managed-process-universal.nix b/nixproc/create-managed-process/universal/create-managed-process-universal.nix
index 73da5e2..04b786b 100644
--- a/nixproc/create-managed-process/universal/create-managed-process-universal.nix
+++ b/nixproc/create-managed-process/universal/create-managed-process-universal.nix
@@ -109,8 +109,8 @@ let
   };
 
   generateS6RCService = import ../../backends/s6-rc/generate-s6-rc-service.nix {
-    inherit (pkgs) stdenv writeTextFile execline;
-    inherit s6-rc tmpDir runtimeDir forceDisableUserChange;
+    inherit (pkgs) stdenv writeTextFile execline s6;
+    inherit s6-rc basePackages tmpDir runtimeDir forceDisableUserChange;
   };
 in
 import ../agnostic/create-managed-process.nix {