Skip to content

Commit 320fea9

Browse files
committed
move variables definition
1 parent 65c0170 commit 320fea9

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

internal/impl/devbox.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -764,9 +764,6 @@ func (d *Devbox) computeNixEnv(ctx context.Context, usePrintDevEnvCache bool) (m
764764
// Append variables from current env if --pure is not passed
765765
currentEnv := os.Environ()
766766
env, err := d.parseEnvAndExcludeSpecialCases(currentEnv)
767-
env["DEVBOX_PROJECT_ROOT"] = d.projectDir
768-
env["DEVBOX_CONFIG_DIR"] = d.projectDir + "/devbox.d"
769-
env["DEVBOX_PACKAGES_DIR"] = d.projectDir + "/.devbox/virtenv/.wrappers"
770767

771768
if err != nil {
772769
return nil, err
@@ -860,6 +857,11 @@ func (d *Devbox) computeNixEnv(ctx context.Context, usePrintDevEnvCache bool) (m
860857
return nil, err
861858
}
862859

860+
// Add helpful env vars for a Devbox project
861+
env["DEVBOX_PROJECT_ROOT"] = d.projectDir
862+
env["DEVBOX_CONFIG_DIR"] = d.projectDir + "/devbox.d"
863+
env["DEVBOX_PACKAGES_DIR"] = d.projectDir + "/.devbox/virtenv/.wrappers"
864+
863865
// Include env variables in devbox.json
864866
configEnv, err := d.configEnvs(ctx, env)
865867
if err != nil {

0 commit comments

Comments
 (0)