diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-07-09 11:37:18 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-07-09 11:37:18 -0400 |
| commit | a7884970c57f821e274fba20473d6fcce95ff6c8 (patch) | |
| tree | 2596841ea2a3ec1363fdbe080292820b34cbb91a /src/libstore | |
| parent | 06a4e15478920bcf8d39c36abc1a73a1e83bc9b7 (diff) | |
Fix DerivationOutputExtensional name
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/derivations.cc | 6 | ||||
| -rw-r--r-- | src/libstore/derivations.hh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index ffeafea87..86f55342d 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -15,7 +15,7 @@ template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>; StorePath DerivationOutput::path(const Store & store, string drvName) const { return std::visit(overloaded { - [](DerivationOutputIntensional doi) { + [](DerivationOutputExtensional doi) { return doi.path; }, [&](DerivationOutputFixed dof) { @@ -142,7 +142,7 @@ static DerivationOutput parseDerivationOutput(const Store & store, istringstream }; } else return DerivationOutput { - .output = DerivationOutputIntensional { + .output = DerivationOutputExtensional { .path = std::move(path), } }; @@ -450,7 +450,7 @@ static DerivationOutput readDerivationOutput(Source & in, const Store & store) }; } else return DerivationOutput { - .output = DerivationOutputIntensional { + .output = DerivationOutputExtensional { .path = std::move(path), } }; diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh index d8cee0f34..2515188ec 100644 --- a/src/libstore/derivations.hh +++ b/src/libstore/derivations.hh @@ -13,7 +13,7 @@ namespace nix { /* Abstract syntax of derivations. */ -struct DerivationOutputIntensional +struct DerivationOutputExtensional { StorePath path; }; @@ -25,7 +25,7 @@ struct DerivationOutputFixed struct DerivationOutput { - std::variant<DerivationOutputIntensional, DerivationOutputFixed> output; + std::variant<DerivationOutputExtensional, DerivationOutputFixed> output; StorePath path(const Store & store, string drvName) const; }; |