nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 12:06:01 +01:00
Code Activity

Expose the fact that storeFS is a MountedSourceAccessor

Browse source 
This will become useful.
This commit is contained in:
Eelco Dolstra 2025-09-22 23:04:58 +02:00 • committed by John Ericson
parent 8ef70ef522
commit 35189c0ae0
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/eval.cc
View file

@ -240,7 +240,7 @@ EvalState::EvalState(
auto realStoreDir = dirOf(store->toRealPath(StorePath::dummy)); auto realStoreDir = dirOf(store->toRealPath(StorePath::dummy));
if (settings.pureEval || store->storeDir != realStoreDir) { if (settings.pureEval || store->storeDir != realStoreDir) {
accessor = settings.pureEval ? storeFS : makeUnionSourceAccessor({accessor, storeFS}); accessor = settings.pureEval ? storeFS.cast<SourceAccessor>() : makeUnionSourceAccessor({accessor, storeFS});
} }
/* Apply access control if needed. */ /* Apply access control if needed. */

3
src/libexpr/include/nix/expr/eval.hh
View file

@ -48,6 +48,7 @@ class StorePath;
struct SingleDerivedPath; struct SingleDerivedPath;
enum RepairFlag : bool; enum RepairFlag : bool;
struct MemorySourceAccessor; struct MemorySourceAccessor;
struct MountedSourceAccessor;
namespace eval_cache { namespace eval_cache {
class EvalCache; class EvalCache;
@ -319,7 +320,7 @@ public:
/** /**
* The accessor corresponding to `store`. * The accessor corresponding to `store`.
*/ */
const ref<SourceAccessor> storeFS; const ref<MountedSourceAccessor> storeFS;
/** /**
* The accessor for the root filesystem. * The accessor for the root filesystem.