nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-17 16:02:43 +01:00
Code Activity

nix develop: Support chroot stores

Browse source 
Fixes #5024.
This commit is contained in:
Eelco Dolstra 2021-07-27 14:23:24 +02:00
parent c000cec27f
commit ed5ad59dc1
3 changed files with 46 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/nix/develop.cc
View file

@ -7,6 +7,7 @@
#include "derivations.hh"
#include "affinity.hh"
#include "progress-bar.hh"
#include "run.hh"
#include <nlohmann/json.hpp>
@ -472,8 +473,6 @@ struct CmdDevelop : Common, MixEnvironment
writeFull(rcFileFd.get(), script);
stopProgressBar();
setEnviron();
// prevent garbage collection until shell exits
setenv("NIX_GCROOT", gcroot.data(), 1);
@ -506,11 +505,7 @@ struct CmdDevelop : Common, MixEnvironment
auto args = phase || !command.empty() ? Strings{std::string(baseNameOf(shell)), rcFilePath}
: Strings{std::string(baseNameOf(shell)), "--rcfile", rcFilePath};
restoreProcessContext();
execvp(shell.c_str(), stringsToCharPtrs(args).data());
throw SysError("executing shell '%s'", shell);
runProgramInStore(store, shell, args);
}
};