diff options
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/globals.hh | 2 | ||||
| -rw-r--r-- | src/libstore/local-fs-store.hh | 8 | ||||
| -rw-r--r-- | src/libstore/store-api.hh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 4709ac715..aba99d969 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -634,7 +634,7 @@ public: line. )"}; - OptionalPathSetting diffHook{ + PathsSetting<std::optional<Path>> diffHook{ this, std::nullopt, "diff-hook", R"( Absolute path to an executable capable of diffing build diff --git a/src/libstore/local-fs-store.hh b/src/libstore/local-fs-store.hh index 56de47424..5b7a149cb 100644 --- a/src/libstore/local-fs-store.hh +++ b/src/libstore/local-fs-store.hh @@ -11,21 +11,21 @@ struct LocalFSStoreConfig : virtual StoreConfig { using StoreConfig::StoreConfig; - const OptionalPathSetting rootDir{this, std::nullopt, + const PathsSetting<std::optional<Path>> rootDir{this, std::nullopt, "root", "Directory prefixed to all other paths."}; - const PathSetting stateDir{this, + const PathsSetting<Path> stateDir{this, rootDir.get() ? *rootDir.get() + "/nix/var/nix" : settings.nixStateDir, "state", "Directory where Lix will store state."}; - const PathSetting logDir{this, + const PathsSetting<Path> logDir{this, rootDir.get() ? *rootDir.get() + "/nix/var/log/nix" : settings.nixLogDir, "log", "directory where Lix will store log files."}; - const PathSetting realStoreDir{this, + const PathsSetting<Path> realStoreDir{this, rootDir.get() ? *rootDir.get() + "/nix/store" : storeDir, "real", "Physical path of the Nix store."}; }; diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 25bc0c823..efd0e4d9b 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -144,7 +144,7 @@ struct StoreConfig : public Config return std::nullopt; } - const PathSetting storeDir_{this, settings.nixStore, + const PathsSetting<Path> storeDir_{this, settings.nixStore, "store", R"( Logical location of the Nix store, usually |