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/libstore/derivations.hh | |
| 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/libstore/derivations.hh')
| -rw-r--r-- | third_party/nix/src/libstore/derivations.hh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/third_party/nix/src/libstore/derivations.hh b/third_party/nix/src/libstore/derivations.hh index 8d46b58b5c..4966b858d3 100644 --- a/third_party/nix/src/libstore/derivations.hh +++ b/third_party/nix/src/libstore/derivations.hh @@ -58,10 +58,9 @@ struct BasicDerivation { BasicDerivation() = default; - // Convert the given proto derivation to a BasicDerivation in the given - // nix::Store. + // Convert the given proto derivation to a BasicDerivation static BasicDerivation from_proto( - const nix::proto::Derivation* proto_derivation, const nix::Store& store); + const nix::proto::Derivation* proto_derivation); [[nodiscard]] nix::proto::Derivation to_proto() const; |