diff options
| author | Griffin Smith <grfn@gws.fyi> | 2020-11-27T21·24-0500 |
|---|---|---|
| committer | glittershark <grfn@gws.fyi> | 2020-11-27T21·28+0000 |
| commit | 1d22874ab29f696c38146750bdd26645d4d75ccc (patch) | |
| tree | 4d5ca1536a40e3d9b2c91f9625baf1dc6def1d9d /third_party/nix/src/nix-daemon | |
| parent | c885bd0274ba878d336e440651994c5d265c54dd (diff) | |
fix(tvix): Don't call assertStorePath on BasicDerivation.builder r/1945
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 <rikingcoding@gmail.com> Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/nix/src/nix-daemon')
| -rw-r--r-- | third_party/nix/src/nix-daemon/nix-daemon-proto.cc | 6 |
1 files changed, 2 insertions, 4 deletions
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<nix::proto::BuildEvent>* 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) { |