diff --git a/spindle/engines/nixery/engine.go b/spindle/engines/nixery/engine.go index 24135263..91251417 100644 --- a/spindle/engines/nixery/engine.go +++ b/spindle/engines/nixery/engine.go @@ -313,7 +313,10 @@ func (e *Engine) RunStep(ctx context.Context, wid models.WorkflowId, w *models.W envs.AddEnv(k, v) } } + envs.AddEnv("HOME", homeDir) + existingPath := "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + envs.AddEnv("PATH", fmt.Sprintf("%s/.nix-profile/bin:/nix/var/nix/profiles/default/bin:%s", homeDir, existingPath)) mkExecResp, err := e.docker.ContainerExecCreate(ctx, addl.container, container.ExecOptions{ Cmd: []string{"bash", "-c", step.Command()}, diff --git a/spindle/engines/nixery/setup_steps.go b/spindle/engines/nixery/setup_steps.go index b22dd687..8c619478 100644 --- a/spindle/engines/nixery/setup_steps.go +++ b/spindle/engines/nixery/setup_steps.go @@ -37,7 +37,7 @@ func dependencyStep(deps map[string][]string) *Step { } if len(customPackages) > 0 { - installCmd := "nix --extra-experimental-features nix-command --extra-experimental-features flakes profile install" + installCmd := "nix --extra-experimental-features nix-command --extra-experimental-features flakes profile add" cmd := fmt.Sprintf("%s %s", installCmd, strings.Join(customPackages, " ")) installStep := Step{ command: cmd,