Merge pull request NixOS#6810 from jfly/jfly/do-not-assume-savedvars-…

…exist nix develop: do not assume that saved vars are set
Minion3665 · Feb 23, 2023 · ee085a1 · ee085a1
2 parents 970d527 + cbcb0d6
commit ee085a1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
@@ -288,8 +288,10 @@ struct Common : InstallableCommand, MixProfile
 
         out << "unset shellHook\n";
 
-        for (auto & var : savedVars)
+        for (auto & var : savedVars) {
+            out << fmt("%s=${%s:-}\n", var, var);
             out << fmt("nix_saved_%s=\"$%s\"\n", var, var);
+        }
 
         buildEnvironment.toBash(out, ignoreVars);