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/libexpr | |
| 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/libexpr')
| -rw-r--r-- | third_party/nix/src/libexpr/primops.cc | 7 | ||||
| -rw-r--r-- | third_party/nix/src/libexpr/primops.hh | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/third_party/nix/src/libexpr/primops.cc b/third_party/nix/src/libexpr/primops.cc index 1684c20413c5..04a44311a259 100644 --- a/third_party/nix/src/libexpr/primops.cc +++ b/third_party/nix/src/libexpr/primops.cc @@ -2,6 +2,7 @@ #include <algorithm> #include <cstring> +#include <iostream> #include <regex> #include <absl/strings/str_split.h> @@ -92,11 +93,7 @@ void EvalState::realiseContext(const PathSet& context) { store->queryMissing(drvs, willBuild, willSubstitute, unknown, downloadSize, narSize); - // TODO(tazjin): Figure out where these logs are supposed to go ... - // unless we keep a per-store stream open persistently there's no - // "generic" way to send logs anywhere for cases like this (IFD). - auto discard_logs = DiscardLogsSink(); - nix::util::OkOrThrow(store->buildPaths(discard_logs, drvs)); + nix::util::OkOrThrow(store->buildPaths(std::cerr, drvs)); } /* Load and evaluate an expression from path specified by the diff --git a/third_party/nix/src/libexpr/primops.hh b/third_party/nix/src/libexpr/primops.hh index 0c9f6ccab1f7..ab5f64720273 100644 --- a/third_party/nix/src/libexpr/primops.hh +++ b/third_party/nix/src/libexpr/primops.hh @@ -6,7 +6,7 @@ namespace nix { struct RegisterPrimOp { - typedef std::vector<std::tuple<std::string, size_t, PrimOpFun>> PrimOps; + using PrimOps = std::vector<std::tuple<std::string, size_t, PrimOpFun> >; static PrimOps* primOps; /* You can register a constant by passing an arity of 0. fun will get called during EvalState initialization, so there |