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

Merge remote-tracking branch 'upstream/master' into optional-derivation-output-storepath

Browse source
This commit is contained in:
John Ericson 2020-07-27 14:29:32 +00:00
commit d5bb67cfa4
31 changed files with 380 additions and 403 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/derivations.cc
View file

@ -23,14 +23,6 @@ StorePath DerivationOutput::path(const Store & store, std::string_view drvName)
}, 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
{