maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix run: Allow passing a command to execute

Browse source 
E.g.

  nix run nixpkgs.hello -c hello --greeting Hallo

Note that unlike "nix-shell --command", no quoting of arguments is
necessary.

"-c" (short for "--command") cannot be combined with "--" because they
both consume all remaining arguments. But since installables shouldn't
start with a dash, this is unlikely to cause problems.
This commit is contained in:
Eelco Dolstra 2017-08-29 14:28:57 +02:00
parent 93a5ef0516
commit 5cc8609e30
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/nix/run.cc
View file

@ -17,8 +17,20 @@ std::string chrootHelperName = "__run_in_chroot";
struct CmdRun : InstallablesCommand
{
Strings command = { "bash" };
CmdRun()
{
mkFlag()
.longName("command")
.shortName('c')
.description("command and arguments to be executed; defaults to 'bash'")
.arity(ArityAny)
.labels({"command", "args"})
.handler([&](Strings ss) {
if (ss.empty()) throw UsageError("--command requires at least one argument");
command = ss;
});
}
std::string name() override
@ -43,8 +55,8 @@ struct CmdRun : InstallablesCommand
unixPath.push_front(path + "/bin");
setenv("PATH", concatStringsSep(":", unixPath).c_str(), 1);
std::string cmd = "bash";
Strings args = { cmd };
std::string cmd = *command.begin();
Strings args = command;
/* If this is a diverted store (i.e. its "logical" location
(typically /nix/store) differs from its "physical" location