jaiden/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #3855 from obsidiansystems/delete-find-output

Browse source 
Get rid of `basicDerivation::findOutput`
This commit is contained in:
Eelco Dolstra 2020-07-23 16:56:58 +02:00 committed by GitHub
parent 4bfba1305e 2274f63453
commit a7b8f79938
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/derivations.cc
View file

@ -7,14 +7,6 @@
namespace nix { namespace nix {
const StorePath & BasicDerivation::findOutput(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;
}
bool BasicDerivation::isBuiltin() const bool BasicDerivation::isBuiltin() const
{ {

4
src/libstore/derivations.hh
View file

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

3
src/nix-env/nix-env.cc
View file

@ -381,7 +381,8 @@ static void queryInstSources(EvalState & state,
if (path.isDerivation()) { if (path.isDerivation()) {
elem.setDrvPath(state.store->printStorePath(path)); elem.setDrvPath(state.store->printStorePath(path));
elem.setOutPath(state.store->printStorePath(state.store->derivationFromPath(path).findOutput("out"))); auto outputs = state.store->queryDerivationOutputMap(path);
elem.setOutPath(state.store->printStorePath(outputs.at("out")));
if (name.size() >= drvExtension.size() && if (name.size() >= drvExtension.size() &&
string(name, name.size() - drvExtension.size()) == drvExtension) string(name, name.size() - drvExtension.size()) == drvExtension)
name = string(name, 0, name.size() - drvExtension.size()); name = string(name, 0, name.size() - drvExtension.size());