diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2022-04-14 14:04:19 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2022-04-14 14:07:04 +0200 |
| commit | d89840b103e57e81e5245c3fe9edfbf7c3477ad5 (patch) | |
| tree | 2b4058e6b37f4b164ae84c89a2a25189b02ccd49 /src/nix/app.cc | |
| parent | 0e58affd3967d113e43811311db9ee090778a756 (diff) | |
Make InstallableFlake::toValue() and toDerivation() behave consistently
In particular, this means that 'nix eval` (which uses toValue()) no
longer auto-calls functions or functors (because
AttrCursor::findAlongAttrPath() doesn't).
Fixes #6152.
Also use ref<> in a few places, and don't return attrpaths from
getCursor() because cursors already have a getAttrPath() method.
Diffstat (limited to 'src/nix/app.cc')
| -rw-r--r-- | src/nix/app.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/app.cc b/src/nix/app.cc index 803d028f0..55efccdee 100644 --- a/src/nix/app.cc +++ b/src/nix/app.cc @@ -61,7 +61,7 @@ std::string resolveString(Store & store, const std::string & toResolve, const Bu UnresolvedApp Installable::toApp(EvalState & state) { - auto [cursor, attrPath] = getCursor(state); + auto cursor = getCursor(state); auto type = cursor->getAttr("type")->getString(); @@ -101,7 +101,7 @@ UnresolvedApp Installable::toApp(EvalState & state) } else - throw Error("attribute '%s' has unsupported type '%s'", attrPath, type); + throw Error("attribute '%s' has unsupported type '%s'", cursor->getAttrPathStr(), type); } // FIXME: move to libcmd |