diff options
author | Artturin <Artturin@artturin.com> | 2022-03-16 20:48:50 +0200 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-03-16 21:01:51 +0200 |
commit | a5c969db496843b9a42b3aee494a02714ee9ca78 (patch) | |
tree | d8a0da56987bcc9b7151755d8e9f674ddf7506dd /src/libcmd/installables.cc | |
parent | d5322698a2abbc6d141e1d244e17b0d226a2f18b (diff) |
nix: allow using --file - to read from stdin
Diffstat (limited to 'src/libcmd/installables.cc')
-rw-r--r-- | src/libcmd/installables.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc index b7623d4ba..784117569 100644 --- a/src/libcmd/installables.cc +++ b/src/libcmd/installables.cc @@ -134,7 +134,9 @@ SourceExprCommand::SourceExprCommand() addFlag({ .longName = "file", .shortName = 'f', - .description = "Interpret installables as attribute paths relative to the Nix expression stored in *file*.", + .description = + "Interpret installables as attribute paths relative to the Nix expression stored in *file*. " + "If *file* is the character -, then a Nix expression will be read from standard input.", .category = installablesCategory, .labels = {"file"}, .handler = {&file}, @@ -695,7 +697,10 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables( auto state = getEvalState(); auto vFile = state->allocValue(); - if (file) + if (file == "-") { + auto e = state->parseStdin(); + state->eval(e, *vFile); + } else if (file) state->evalFile(lookupFileArg(*state, *file), *vFile); else { auto e = state->parseExprFromString(*expr, absPath(".")); |