lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

nix develop: Preserve stdin with -c

Browse source
This commit is contained in:
Sebastian Ullrich 2020-11-07 15:00:22 +01:00
parent 387f824cab
commit fb7735e4cf
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nix/develop.cc
View file

@ -474,9 +474,9 @@ struct CmdDevelop : Common, MixEnvironment
ignoreException();
}
// If running a phase, don't want an interactive shell running after
// If running a phase or single command, don't want an interactive shell running after
// Ctrl-C, so don't pass --rcfile
auto args = phase ? Strings{std::string(baseNameOf(shell)), rcFilePath}
auto args = phase || !command.empty() ? Strings{std::string(baseNameOf(shell)), rcFilePath}
: Strings{std::string(baseNameOf(shell)), "--rcfile", rcFilePath};
restoreAffinity();

1
tests/nix-shell.sh
View file

@ -58,6 +58,7 @@ output=$($TEST_ROOT/shell.shebang.rb abc ruby)
# Test 'nix develop'.
nix develop -f shell.nix shellDrv -c bash -c '[[ -n $stdenv ]]'
echo foo | nix develop -f shell.nix shellDrv -c cat # preserve stdin with `-c`
# Test 'nix print-dev-env'.
source <(nix print-dev-env -f shell.nix shellDrv)