Skip to content

Commit 35189c0

Browse files
edolstraEricson2314
authored andcommitted
Expose the fact that storeFS is a MountedSourceAccessor
This will become useful.
1 parent 8ef70ef commit 35189c0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/libexpr/eval.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ EvalState::EvalState(
240240

241241
auto realStoreDir = dirOf(store->toRealPath(StorePath::dummy));
242242
if (settings.pureEval || store->storeDir != realStoreDir) {
243-
accessor = settings.pureEval ? storeFS : makeUnionSourceAccessor({accessor, storeFS});
243+
accessor = settings.pureEval ? storeFS.cast<SourceAccessor>() : makeUnionSourceAccessor({accessor, storeFS});
244244
}
245245

246246
/* Apply access control if needed. */

src/libexpr/include/nix/expr/eval.hh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class StorePath;
4848
struct SingleDerivedPath;
4949
enum RepairFlag : bool;
5050
struct MemorySourceAccessor;
51+
struct MountedSourceAccessor;
5152

5253
namespace eval_cache {
5354
class EvalCache;
@@ -319,7 +320,7 @@ public:
319320
/**
320321
* The accessor corresponding to `store`.
321322
*/
322-
const ref<SourceAccessor> storeFS;
323+
const ref<MountedSourceAccessor> storeFS;
323324

324325
/**
325326
* The accessor for the root filesystem.

0 commit comments

Comments
 (0)