diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-08-21T01·07+0100 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2020-08-21T01·35+0000 |
| commit | 06681c35a9191656b8f3a9a343e21457a71a947d (patch) | |
| tree | 68f05e9e535f7951c196c930c317d0132287247e /third_party/nix/src/nix-env/nix-env.cc | |
| parent | 262af89f81eda6ce26845563141481d447e04a06 (diff) | |
refactor(tvix): Replace several DiscardLogsSink() with std::cerr r/1698
Introduces the actual log sink in several places where we actually want the build logs to thread through correctly. This should cover *most* build paths. Change-Id: I735dff8a79f7e35a5874eb89b4abb980f9703dc2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1827 Reviewed-by: glittershark <grfn@gws.fyi> Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/nix/src/nix-env/nix-env.cc')
| -rw-r--r-- | third_party/nix/src/nix-env/nix-env.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/third_party/nix/src/nix-env/nix-env.cc b/third_party/nix/src/nix-env/nix-env.cc index e42fc29c2267..9c0931e7f4ad 100644 --- a/third_party/nix/src/nix-env/nix-env.cc +++ b/third_party/nix/src/nix-env/nix-env.cc @@ -722,10 +722,8 @@ static void opSet(Globals& globals, Strings opFlags, Strings opArgs) { if (globals.dryRun) { return; } - auto discard_logs = DiscardLogsSink(); nix::util::OkOrThrow(globals.state->store->buildPaths( - discard_logs, paths, - globals.state->repair != 0u ? bmRepair : bmNormal)); + std::cerr, paths, globals.state->repair != 0u ? bmRepair : bmNormal)); } else { printMissing(globals.state->store, {drv.queryOutPath()}); if (globals.dryRun) { |