diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-23 19:17:52 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-23 19:17:52 +0000 |
| commit | 58e55c0923833512853a9c08ca556936faeb21dc (patch) | |
| tree | 4c2fc3599534046dd64816ebec8f9bf0e970fb23 /src/libstore | |
| parent | c36916eca0edbbbbaf928405b7e2cc89840eac49 (diff) | |
| parent | a2af25c55a9d8a0bc7333b5e3e3597353a2bd65a (diff) | |
Merge branch 'misc-ca' of github.com:obsidiansystems/nix into derivation-primop-floating-output
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/derivations.cc | 8 | ||||
| -rw-r--r-- | src/libstore/derivations.hh | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index 2a95c7e69..157fc1db1 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -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 { diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh index 04cf14cba..b1cda85cb 100644 --- a/src/libstore/derivations.hh +++ b/src/libstore/derivations.hh @@ -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. */ |