summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nix/libstore/globals.cc7
-rw-r--r--nix/libstore/globals.hh7
2 files changed, 1 insertions, 13 deletions
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc
index 885ba4eafc1..eb7e7dac413 100644
--- a/nix/libstore/globals.cc
+++ b/nix/libstore/globals.cc
@@ -72,7 +72,6 @@ void Settings::processEnvironment()
void Settings::set(const string & name, const string & value)
{
settings[name] = value;
- overrides[name] = value;
}
@@ -196,10 +195,4 @@ string Settings::pack()
}
-Settings::SettingsMap Settings::getOverrides()
-{
- return overrides;
-}
-
-
}
diff --git a/nix/libstore/globals.hh b/nix/libstore/globals.hh
index d68993f280f..8ce8aa665a8 100644
--- a/nix/libstore/globals.hh
+++ b/nix/libstore/globals.hh
@@ -40,8 +40,6 @@ struct Settings {
string pack();
- SettingsMap getOverrides();
-
/* The directory where we store sources and derived files. */
Path nixStore;
@@ -216,7 +214,7 @@ struct Settings {
Path slirp4netns;
private:
- SettingsMap settings, overrides;
+ SettingsMap settings;
void _get(string & res, const string & name);
void _get(bool & res, const string & name);
@@ -230,7 +228,4 @@ private:
inline Settings settings;
-inline const string nixVersion {PACKAGE_VERSION};
-
-
}