mirror of
https://github.com/NixOS/nix
synced 2025-07-06 21:41:48 +02:00
Merge branch 'optional-derivation-output-storepath' into ca-derivation-data-types
This commit is contained in:
commit
78466bcb2f
22 changed files with 228 additions and 301 deletions
|
@ -24,14 +24,6 @@ std::optional<StorePath> DerivationOutput::pathOpt(const Store & store, std::str
|
|||
}, output);
|
||||
}
|
||||
|
||||
const StorePath BasicDerivation::findOutput(const Store & store, const string & id) const
|
||||
{
|
||||
auto i = outputs.find(id);
|
||||
if (i == outputs.end())
|
||||
throw Error("derivation has no output '%s'", id);
|
||||
return i->second.path(store, name);
|
||||
}
|
||||
|
||||
|
||||
bool BasicDerivation::isBuiltin() const
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue