aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/globals.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstore/globals.hh')
-rw-r--r--src/libstore/globals.hh15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index a423b4e5c..462721681 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -16,8 +16,6 @@ struct Settings {
Settings();
- void processEnvironment();
-
void loadConfFile();
void set(const string & name, const string & value);
@@ -183,9 +181,6 @@ struct Settings {
/* Whether to show a stack trace if Nix evaluation fails. */
bool showTrace;
- /* A list of URL prefixes that can return Nix build logs. */
- Strings logServers;
-
/* Whether the importNative primop should be enabled */
bool enableImportNative;
@@ -193,6 +188,16 @@ struct Settings {
build settings */
Path preBuildHook;
+ /* Path to the netrc file used to obtain usernames/passwords for
+ downloads. */
+ Path netrcFile;
+
+ /* Path to the SSL CA file used */
+ Path caFile;
+
+ /* Whether we allow import-from-derivation */
+ bool enableImportFromDerivation;
+
private:
SettingsMap settings, overrides;