Fix fwd-env "PATH" not working

Jail.nix does not expose `$PATH` by default because the automatic
runtime-closure binding often means your `$PATH` won't work anyway.

However, for some jails, you may want to disable the runtime-closure
binding and just bind your whole nix store. In those cases, it would be
nice if `fwd-env "PATH"` worked correctly.
This commit is contained in:
Alex David 2026-02-26 12:32:34 -08:00
commit 42b355c38c
5 changed files with 45 additions and 5 deletions

View file

@ -4,5 +4,12 @@
doc = ''
Prepends the passed string to `$PATH`.
'';
impl = path: state: state // { path = [ path ] ++ state.path; };
impl =
path: state:
state
// {
env = state.env // {
PATH = if state.env ? PATH && state.env.PATH != "" then "${path}:${state.env.PATH}" else path;
};
};
}

View file

@ -7,5 +7,18 @@ in
doc = ''
Adds the packages' `bin` directory to `$PATH`.
'';
impl = pkgs: compose (builtins.map (pkg: add-path "${lib.getBin pkg}/bin") pkgs);
impl =
pkgsToAdd:
compose (
builtins.map (pkg: add-path "${lib.getBin pkg}/bin") pkgsToAdd
++ [
(
state:
state
// {
additionalRuntimeClosures = state.additionalRuntimeClosures ++ (map toString pkgsToAdd);
}
)
]
);
}

View file

@ -50,7 +50,6 @@ in
let
runtimeClosure = pkgs.writeText "${state.name}-runtime-closure" ''
${pkgs.lib.concatStringsSep "\n" state.additionalRuntimeClosures}
${pkgs.lib.concatStringsSep "\n" state.path}
${state.argv}
${state.entry}
'';