From 65c0170cbc542e9a0d6becb6ebb2cea8c5c6390b Mon Sep 17 00:00:00 2001
From: John Lago <750845+Lagoja@users.noreply.github.com>
Date: Mon, 9 Oct 2023 21:34:36 +0000
Subject: [PATCH 1/2] add helpful env vars during shell + run

---
 internal/impl/devbox.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/internal/impl/devbox.go b/internal/impl/devbox.go
index ec7392280a2..90e42bfb611 100644
--- a/internal/impl/devbox.go
+++ b/internal/impl/devbox.go
@@ -764,6 +764,10 @@ func (d *Devbox) computeNixEnv(ctx context.Context, usePrintDevEnvCache bool) (m
 	// Append variables from current env if --pure is not passed
 	currentEnv := os.Environ()
 	env, err := d.parseEnvAndExcludeSpecialCases(currentEnv)
+	env["DEVBOX_PROJECT_ROOT"] = d.projectDir
+	env["DEVBOX_CONFIG_DIR"] = d.projectDir + "/devbox.d"
+	env["DEVBOX_PACKAGES_DIR"] = d.projectDir + "/.devbox/virtenv/.wrappers"
+
 	if err != nil {
 		return nil, err
 	}

From 320fea95d1e12a4d9ed91bdaf64c9da00219d03c Mon Sep 17 00:00:00 2001
From: John Lago <750845+Lagoja@users.noreply.github.com>
Date: Tue, 10 Oct 2023 15:05:04 -0700
Subject: [PATCH 2/2] move variables definition

---
 internal/impl/devbox.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/internal/impl/devbox.go b/internal/impl/devbox.go
index 90e42bfb611..aee7445cb1f 100644
--- a/internal/impl/devbox.go
+++ b/internal/impl/devbox.go
@@ -764,9 +764,6 @@ func (d *Devbox) computeNixEnv(ctx context.Context, usePrintDevEnvCache bool) (m
 	// Append variables from current env if --pure is not passed
 	currentEnv := os.Environ()
 	env, err := d.parseEnvAndExcludeSpecialCases(currentEnv)
-	env["DEVBOX_PROJECT_ROOT"] = d.projectDir
-	env["DEVBOX_CONFIG_DIR"] = d.projectDir + "/devbox.d"
-	env["DEVBOX_PACKAGES_DIR"] = d.projectDir + "/.devbox/virtenv/.wrappers"
 
 	if err != nil {
 		return nil, err
@@ -860,6 +857,11 @@ func (d *Devbox) computeNixEnv(ctx context.Context, usePrintDevEnvCache bool) (m
 		return nil, err
 	}
 
+	// Add helpful env vars for a Devbox project
+	env["DEVBOX_PROJECT_ROOT"] = d.projectDir
+	env["DEVBOX_CONFIG_DIR"] = d.projectDir + "/devbox.d"
+	env["DEVBOX_PACKAGES_DIR"] = d.projectDir + "/.devbox/virtenv/.wrappers"
+
 	// Include env variables in devbox.json
 	configEnv, err := d.configEnvs(ctx, env)
 	if err != nil {