From b43e1e186e50bedc30d05d063dffbd751c1ff161 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 15 May 2019 15:38:24 +0200
Subject: CachedDownloadResult: Include store path

Also, make fetchGit and fetchMercurial update allowedPaths properly.

(Maybe the evaluator, rather than the caller of the evaluator, should
apply toRealPath(), but that's a bigger change.)

(cherry picked from commit 5c34d665386f4053d666b0899ecca0639e500fbd)
---
 src/libstore/download.hh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/libstore/download.hh')

diff --git a/src/libstore/download.hh b/src/libstore/download.hh
index 8acfe4e1a39c..aa8c34be2d61 100644
--- a/src/libstore/download.hh
+++ b/src/libstore/download.hh
@@ -43,6 +43,9 @@ struct DownloadResult
 
 struct CachedDownloadResult
 {
+    // Note: 'storePath' may be different from 'path' when using a
+    // chroot store.
+    Path storePath;
     Path path;
     std::optional<std::string> etag;
 };
-- 
cgit 1.4.1