about summary refs log tree commit diff
path: root/third_party/nix/src/build-remote/build-remote.cc
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-11-27T23·12-0500
committerglittershark <grfn@gws.fyi>2020-11-28T00·47+0000
commit49024be05644d4fac252e2191e9de74e0ffd4fe3 (patch)
tree73658943ab7a8230215a59e5ec9288882463bc2e /third_party/nix/src/build-remote/build-remote.cc
parent1d22874ab29f696c38146750bdd26645d4d75ccc (diff)
feat(tvix): Thread a log sink through calls to buildDerivation r/1946
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 <andi@notmuch.email>
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Diffstat (limited to 'third_party/nix/src/build-remote/build-remote.cc')
-rw-r--r--third_party/nix/src/build-remote/build-remote.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/nix/src/build-remote/build-remote.cc b/third_party/nix/src/build-remote/build-remote.cc
index 00bd833ac3..43564a5eb7 100644
--- a/third_party/nix/src/build-remote/build-remote.cc
+++ b/third_party/nix/src/build-remote/build-remote.cc
@@ -246,7 +246,7 @@ static int _main(int argc, char* argv[]) {
         readDerivation(store->realStoreDir + "/" + baseNameOf(drvPath)));
     drv.inputSrcs = inputs;
 
-    auto result = sshStore->buildDerivation(drvPath, drv);
+    auto result = sshStore->buildDerivation(std::cerr, drvPath, drv);
 
     if (!result.success()) {
       throw Error("build of '%s' on '%s' failed: %s", drvPath, storeUri,