Fix DerivationOutputExtensional name
This commit is contained in:
parent
06a4e15478
commit
a7884970c5
|
@ -798,7 +798,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
|
||||||
if (!jsonObject) drv.env[i] = "";
|
if (!jsonObject) drv.env[i] = "";
|
||||||
drv.outputs.insert_or_assign(i,
|
drv.outputs.insert_or_assign(i,
|
||||||
DerivationOutput {
|
DerivationOutput {
|
||||||
.output = DerivationOutputIntensional {
|
.output = DerivationOutputExtensional {
|
||||||
.path = StorePath::dummy,
|
.path = StorePath::dummy,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
@ -811,7 +811,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
|
||||||
if (!jsonObject) drv.env[i] = state.store->printStorePath(outPath);
|
if (!jsonObject) drv.env[i] = state.store->printStorePath(outPath);
|
||||||
drv.outputs.insert_or_assign(i,
|
drv.outputs.insert_or_assign(i,
|
||||||
DerivationOutput {
|
DerivationOutput {
|
||||||
.output = DerivationOutputIntensional {
|
.output = DerivationOutputExtensional {
|
||||||
.path = std::move(outPath),
|
.path = std::move(outPath),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -15,7 +15,7 @@ template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
|
||||||
StorePath DerivationOutput::path(const Store & store, string drvName) const
|
StorePath DerivationOutput::path(const Store & store, string drvName) const
|
||||||
{
|
{
|
||||||
return std::visit(overloaded {
|
return std::visit(overloaded {
|
||||||
[](DerivationOutputIntensional doi) {
|
[](DerivationOutputExtensional doi) {
|
||||||
return doi.path;
|
return doi.path;
|
||||||
},
|
},
|
||||||
[&](DerivationOutputFixed dof) {
|
[&](DerivationOutputFixed dof) {
|
||||||
|
@ -142,7 +142,7 @@ static DerivationOutput parseDerivationOutput(const Store & store, istringstream
|
||||||
};
|
};
|
||||||
} else
|
} else
|
||||||
return DerivationOutput {
|
return DerivationOutput {
|
||||||
.output = DerivationOutputIntensional {
|
.output = DerivationOutputExtensional {
|
||||||
.path = std::move(path),
|
.path = std::move(path),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -450,7 +450,7 @@ static DerivationOutput readDerivationOutput(Source & in, const Store & store)
|
||||||
};
|
};
|
||||||
} else
|
} else
|
||||||
return DerivationOutput {
|
return DerivationOutput {
|
||||||
.output = DerivationOutputIntensional {
|
.output = DerivationOutputExtensional {
|
||||||
.path = std::move(path),
|
.path = std::move(path),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -13,7 +13,7 @@ namespace nix {
|
||||||
|
|
||||||
/* Abstract syntax of derivations. */
|
/* Abstract syntax of derivations. */
|
||||||
|
|
||||||
struct DerivationOutputIntensional
|
struct DerivationOutputExtensional
|
||||||
{
|
{
|
||||||
StorePath path;
|
StorePath path;
|
||||||
};
|
};
|
||||||
|
@ -25,7 +25,7 @@ struct DerivationOutputFixed
|
||||||
|
|
||||||
struct DerivationOutput
|
struct DerivationOutput
|
||||||
{
|
{
|
||||||
std::variant<DerivationOutputIntensional, DerivationOutputFixed> output;
|
std::variant<DerivationOutputExtensional, DerivationOutputFixed> output;
|
||||||
StorePath path(const Store & store, string drvName) const;
|
StorePath path(const Store & store, string drvName) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -135,7 +135,7 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)
|
||||||
drv.inputSrcs.insert(std::move(getEnvShPath));
|
drv.inputSrcs.insert(std::move(getEnvShPath));
|
||||||
Hash h = hashDerivationModulo(*store, drv, true);
|
Hash h = hashDerivationModulo(*store, drv, true);
|
||||||
auto shellOutPath = store->makeOutputPath("out", h, drvName);
|
auto shellOutPath = store->makeOutputPath("out", h, drvName);
|
||||||
drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputIntensional {
|
drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputExtensional {
|
||||||
.path = shellOutPath
|
.path = shellOutPath
|
||||||
} });
|
} });
|
||||||
drv.env["out"] = store->printStorePath(shellOutPath);
|
drv.env["out"] = store->printStorePath(shellOutPath);
|
||||||
|
|
Loading…
Reference in a new issue