1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 06:21:14 +02:00

Merge remote-tracking branch 'upstream/master' into misc-ca

This commit is contained in:
John Ericson 2020-07-23 19:14:17 +00:00
commit a2af25c55a
4 changed files with 2 additions and 132 deletions

View file

@ -53,14 +53,6 @@ bool derivationIsImpure(DerivationType dt) {
abort();
}
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
{