refactor(tvix): Use absl::btree_map for BasicDerivation's env
Change-Id: I111a9a268debea322f23fdced3bed9ff3e8ed3b3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1685 Reviewed-by: glittershark <grfn@gws.fyi> Tested-by: BuildkiteCI
This commit is contained in:
parent
3ec3661678
commit
6a97206ceb
2 changed files with 4 additions and 3 deletions
5
third_party/nix/src/libstore/derivations.cc
vendored
5
third_party/nix/src/libstore/derivations.cc
vendored
|
@ -50,8 +50,9 @@ BasicDerivation BasicDerivation::from_proto(
|
|||
result.args.insert(result.args.end(), proto_derivation->args().begin(),
|
||||
proto_derivation->args().end());
|
||||
|
||||
result.env.insert(proto_derivation->env().begin(),
|
||||
proto_derivation->env().end());
|
||||
for (auto [k, v] : proto_derivation->env()) {
|
||||
result.env.emplace(k, v);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
2
third_party/nix/src/libstore/derivations.hh
vendored
2
third_party/nix/src/libstore/derivations.hh
vendored
|
@ -44,7 +44,7 @@ using DerivationOutputs = absl::btree_map<std::string, DerivationOutput>;
|
|||
output IDs we are interested in. */
|
||||
using DerivationInputs = absl::btree_map<Path, StringSet>;
|
||||
|
||||
using StringPairs = std::map<std::string, std::string>;
|
||||
using StringPairs = absl::btree_map<std::string, std::string>;
|
||||
|
||||
struct BasicDerivation {
|
||||
DerivationOutputs outputs; /* keyed on symbolic IDs */
|
||||
|
|
Loading…
Reference in a new issue