1 files changed, 15 insertions, 0 deletions
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index c823f16c8..c20b9f272 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -9,6 +9,7 @@
 #include "progress-bar.hh"
 #include "run.hh"
 
+#include <memory>
 #include <nlohmann/json.hpp>
 
 using namespace nix;
@@ -505,6 +506,20 @@ struct CmdDevelop : Common, MixEnvironment
         auto args = phase || !command.empty() ? Strings{std::string(baseNameOf(shell)), rcFilePath}
             : Strings{std::string(baseNameOf(shell)), "--rcfile", rcFilePath};
 
+        // Need to chdir since phases assume in flake directory
+        if (phase) {
+            // chdir if installable is a flake of type git+file or path
+            auto installableFlake = std::dynamic_pointer_cast<InstallableFlake>(installable);
+            if (installableFlake) {
+                auto sourcePath = installableFlake->getLockedFlake()->flake.resolvedRef.input.getSourcePath();
+                if (sourcePath) {
+                    if (chdir(sourcePath->c_str()) == -1) {
+                        throw SysError("chdir to '%s' failed", *sourcePath);
+                    }
+                }
+            }
+        }
+
         runProgramInStore(store, shell, args);
     }
 };