From 1d22874ab29f696c38146750bdd26645d4d75ccc Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Fri, 27 Nov 2020 16:24:08 -0500 Subject: fix(tvix): Don't call assertStorePath on BasicDerivation.builder Upstream doesn't, and for good reason - this might not be a store path, for example if it's /bin/sh Fixes: b/73 Change-Id: If9aa96de2cd8ab941c098a9f122b8b302a92ec38 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2175 Reviewed-by: kanepyork Tested-by: BuildkiteCI --- third_party/nix/src/nix-daemon/nix-daemon-proto.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'third_party/nix/src/nix-daemon') diff --git a/third_party/nix/src/nix-daemon/nix-daemon-proto.cc b/third_party/nix/src/nix-daemon/nix-daemon-proto.cc index eab10e9572aa..597ef2434a07 100644 --- a/third_party/nix/src/nix-daemon/nix-daemon-proto.cc +++ b/third_party/nix/src/nix-daemon/nix-daemon-proto.cc @@ -674,15 +674,13 @@ class WorkerServiceImpl final : public WorkerService::Service { } Status BuildDerivation( - grpc::ServerContext* context, - const nix::proto::BuildDerivationRequest* request, + grpc::ServerContext*, const nix::proto::BuildDerivationRequest* request, grpc::ServerWriter* writer) override { return HandleExceptions( [&]() -> Status { auto drv_path = request->drv_path().path(); ASSERT_INPUT_STORE_PATH(drv_path); - auto drv = - BasicDerivation::from_proto(&request->derivation(), *store_); + auto drv = BasicDerivation::from_proto(&request->derivation()); auto build_mode = nix::BuildModeFrom(request->build_mode()); if (!build_mode) { -- cgit 1.4.1