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/libstore/derivations.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'third_party/nix/src/libstore/derivations.cc') diff --git a/third_party/nix/src/libstore/derivations.cc b/third_party/nix/src/libstore/derivations.cc index ed184b6d9de4..9c344502f386 100644 --- a/third_party/nix/src/libstore/derivations.cc +++ b/third_party/nix/src/libstore/derivations.cc @@ -43,11 +43,10 @@ nix::proto::Derivation_DerivationOutput DerivationOutput::to_proto() const { } BasicDerivation BasicDerivation::from_proto( - const nix::proto::Derivation* proto_derivation, const nix::Store& store) { + const nix::proto::Derivation* proto_derivation) { BasicDerivation result; result.platform = proto_derivation->platform(); result.builder = proto_derivation->builder().path(); - store.assertStorePath(result.builder); for (auto [k, v] : proto_derivation->outputs()) { result.outputs.emplace(k, v); -- cgit 1.4.1