nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-20 17:29:36 +01:00
Code Activity

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/derivations.cc
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
{

4
src/libstore/derivations.hh
View file

@ -90,10 +90,6 @@ struct BasicDerivation
BasicDerivation() { }
virtual ~BasicDerivation() { };
/* Return the path corresponding to the output identifier `id' in
the given derivation. */
const StorePath findOutput(const Store & store, const std::string & id) const;
bool isBuiltin() const;
/* Return true iff this is a fixed-output derivation. */