mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-10 00:08:07 +02:00
Merge pull request #10754 from qwqawawow/master
nix repl: make runNix() isInteractive is true by default
This commit is contained in:
commit
8527f4e7fa
1 changed files with 3 additions and 6 deletions
|
@ -137,12 +137,13 @@ void runNix(Path program, const Strings & args,
|
|||
{
|
||||
auto subprocessEnv = getEnv();
|
||||
subprocessEnv["NIX_CONFIG"] = globalConfig.toKeyValue();
|
||||
|
||||
//isInteractive avoid grabling interactive commands
|
||||
runProgram2(RunOptions {
|
||||
.program = settings.nixBinDir+ "/" + program,
|
||||
.args = args,
|
||||
.environment = subprocessEnv,
|
||||
.input = input,
|
||||
.isInteractive = true,
|
||||
});
|
||||
|
||||
return;
|
||||
|
@ -510,13 +511,9 @@ ProcessLineResult NixRepl::processLine(std::string line)
|
|||
auto editor = args.front();
|
||||
args.pop_front();
|
||||
|
||||
// avoid garbling the editor with the progress bar
|
||||
logger->pause();
|
||||
Finally resume([&]() { logger->resume(); });
|
||||
|
||||
// runProgram redirects stdout to a StringSink,
|
||||
// using runProgram2 to allow editors to display their UI
|
||||
runProgram2(RunOptions { .program = editor, .lookupPath = true, .args = args });
|
||||
runProgram2(RunOptions { .program = editor, .lookupPath = true, .args = args , .isInteractive = true });
|
||||
|
||||
// Reload right after exiting the editor
|
||||
state->resetFileCache();
|
||||
|
|
Loading…
Reference in a new issue