mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-10 08:16:15 +02:00
Merge branch 'fix-3976' of https://github.com/mkenigs/nix
This commit is contained in:
commit
b71428c907
1 changed files with 15 additions and 0 deletions
|
@ -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);
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue