aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/globals.hh
diff options
context:
space:
mode:
authorRebecca Turner <rbt@sent.as>2024-08-25 11:58:10 -0700
committerRebecca Turner <rbt@sent.as>2024-08-25 15:54:22 -0700
commit5fc6fcb31035f79a8e590f07d73dc6cc592e9e29 (patch)
treea47f804e3b3d74688e1dab6b6fd952664e0ef88b /src/libstore/globals.hh
parentb6884388a1281d70bb4e5bb12e1cadd34bb832f0 (diff)
Thread `ApplyConfigOptions` through config parsing
This makes no changes to logic but makes the `ApplyConfigOptions` value available to consumers. Change-Id: I88cf53d38faac8472c556aee55c13d0acbd1e5db
Diffstat (limited to 'src/libstore/globals.hh')
-rw-r--r--src/libstore/globals.hh5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index aba99d969..51550b2c3 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -26,7 +26,7 @@ struct MaxBuildJobsSetting : public BaseSetting<unsigned int>
options->addSetting(this);
}
- unsigned int parse(const std::string & str) const override;
+ unsigned int parse(const std::string & str, const ApplyConfigOptions & options) const override;
};
struct PluginFilesSetting : public BaseSetting<Paths>
@@ -43,7 +43,7 @@ struct PluginFilesSetting : public BaseSetting<Paths>
options->addSetting(this);
}
- Paths parse(const std::string & str) const override;
+ Paths parse(const std::string & str, const ApplyConfigOptions & options) const override;
};
const uint32_t maxIdsPerBuild =
@@ -1088,6 +1088,7 @@ void loadConfFile();
// Used by the Settings constructor
std::vector<Path> getUserConfigFiles();
+std::vector<Path> getHomeConfigFile();
extern const std::string nixVersion;