mirror of
https://github.com/NixOS/nix.git
synced 2025-11-10 20:46:01 +01:00
fetchTree: Return a path instead of a store path
Co-authored-by: Eelco Dolstra <edolstra@gmail.com> Co-authored-by: Robert Hensing <robert@roberthensing.nl>
This commit is contained in:
parent
fa49d2e356
commit
50b00b0194
16 changed files with 165 additions and 118 deletions
|
|
@ -131,12 +131,12 @@ struct ExprString : Expr
|
|||
|
||||
struct ExprPath : Expr
|
||||
{
|
||||
ref<SourceAccessor> accessor;
|
||||
std::string s;
|
||||
const SourcePath path;
|
||||
Value v;
|
||||
ExprPath(ref<SourceAccessor> accessor, std::string s) : accessor(accessor), s(std::move(s))
|
||||
ExprPath(SourcePath && path)
|
||||
: path(path)
|
||||
{
|
||||
v.mkPath(&*accessor, this->s.c_str());
|
||||
v.mkPath(&*path.accessor, strdup(path.path.abs().c_str()));
|
||||
}
|
||||
Value * maybeThunk(EvalState & state, Env & env) override;
|
||||
COMMON_METHODS
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue