From 49024be05644d4fac252e2191e9de74e0ffd4fe3 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Fri, 27 Nov 2020 18:12:44 -0500 Subject: feat(tvix): Thread a log sink through calls to buildDerivation Similarly to how we did for buildPaths, add a std::ostream& log_sink parameter to the build_derivation method on Store, and pass it std::cerr when called at the top level by nix commands - most notably, the build-remote hook binary, so that we get build logs when using tvix as a remote builder. Change-Id: I0f8f729ba8429d4838a0a135a5c2ac1e1a95d575 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2176 Tested-by: BuildkiteCI Reviewed-by: andi Reviewed-by: kanepyork --- third_party/nix/src/nix-store/nix-store.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/nix/src/nix-store') diff --git a/third_party/nix/src/nix-store/nix-store.cc b/third_party/nix/src/nix-store/nix-store.cc index 535903d823ed..532f60b7b7e3 100644 --- a/third_party/nix/src/nix-store/nix-store.cc +++ b/third_party/nix/src/nix-store/nix-store.cc @@ -1088,7 +1088,7 @@ static void opServe(Strings opFlags, Strings opArgs) { getBuildSettings(); MonitorFdHup monitor(in.fd); - auto status = store->buildDerivation(drvPath, drv); + auto status = store->buildDerivation(std::cerr, drvPath, drv); out << status.status << status.errorMsg; -- cgit 1.4.1