lewis.moe
Monorepo for Tangled
spindle/nixery: fix path construction
binaries added via nix-profile are stored in ~/.nix-profile/bin. we now
add this to the PATH during step execution.
Signed-off-by: oppiliappan <me@oppi.li>
authored by
oppiliappan
and committed by
+3
spindle/engines/nixery/engine.go
+3
spindle/engines/nixery/engine.go
···
313
313
envs.AddEnv(k, v)
314
314
}
315
315
}
316
+
316
317
envs.AddEnv("HOME", homeDir)
318
+
existingPath := "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
319
+
envs.AddEnv("PATH", fmt.Sprintf("%s/.nix-profile/bin:/nix/var/nix/profiles/default/bin:%s", homeDir, existingPath))
317
320
318
321
mkExecResp, err := e.docker.ContainerExecCreate(ctx, addl.container, container.ExecOptions{
319
322
Cmd: []string{"bash", "-c", step.Command()},
+1
-1
spindle/engines/nixery/setup_steps.go
+1
-1
spindle/engines/nixery/setup_steps.go
···
37
37
}
38
38
39
39
if len(customPackages) > 0 {
40
-
installCmd := "nix --extra-experimental-features nix-command --extra-experimental-features flakes profile install"
40
+
installCmd := "nix --extra-experimental-features nix-command --extra-experimental-features flakes profile add"
41
41
cmd := fmt.Sprintf("%s %s", installCmd, strings.Join(customPackages, " "))
42
42
installStep := Step{
43
43
command: cmd,