aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-10-01 11:33:57 +0200
committerGitHub <noreply@github.com>2019-10-01 11:33:57 +0200
commit4e60c5ec657aeef7973d7383c0aaa113ea10b002 (patch)
treefa66060b899c51937976e899da0c3cd29186d59d
parent2d2769f68c7920854ef34ad723c910b6ea2e973d (diff)
parent168a8879165dd0deab1a93d343a6003146f37031 (diff)
Merge pull request #3112 from zimbatm/fetchTarball-with-chroot
Fix fetchTarball with chroot stores
-rw-r--r--src/libexpr/primops.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 350dba474..d4c60f870 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -2089,12 +2089,12 @@ void fetch(EvalState & state, const Pos & pos, Value * * args, Value & v,
if (evalSettings.pureEval && !request.expectedHash)
throw Error("in pure evaluation mode, '%s' requires a 'sha256' argument", who);
- Path res = getDownloader()->downloadCached(state.store, request).path;
+ auto res = getDownloader()->downloadCached(state.store, request);
if (state.allowedPaths)
- state.allowedPaths->insert(res);
+ state.allowedPaths->insert(res.path);
- mkString(v, res, PathSet({res}));
+ mkString(v, res.storePath, PathSet({res.storePath}));
}