ehmry
/
nix-processmgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problem with essential missing base packages when a PATH is provided

This commit is contained in:
Sander van der Burg 2021-02-17 22:13:25 +01:00 committed by Sander van der Burg
parent 2b35bb34de
commit 8eb8c98b44
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixproc/backends/s6-rc/generate-s6-rc-service.nix
View File

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

4
nixproc/create-managed-process/universal/create-managed-process-universal.nix
View File

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