* Allow the canonical system name to be specified at runtime in the

  Nix config file.

2 files changed, 5 insertions, 1 deletions

diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 194e1165face..ac8e19b7d46b 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -17,6 +17,7 @@ bool tryFallback = false;
 Verbosity buildVerbosity = lvlInfo;
 unsigned int maxBuildJobs = 1;
 bool readOnlyMode = false;
+string thisSystem = "unset";
 
 
 static bool settingsRead = false;
@@ -26,7 +27,7 @@ static map<string, Strings> settings;
 
 string & at(Strings & ss, unsigned int n)
 {
-    Strings::iterator i =ss.begin();
+    Strings::iterator i = ss.begin();
     advance(i, n);
     return *i;
 }
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index b5de709f7b54..408076b751e7 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -53,6 +53,9 @@ extern unsigned int maxBuildJobs;
    database. */
 extern bool readOnlyMode;
 
+/* The canonical system name, as returned by config.guess. */ 
+extern string thisSystem;
+
 
 Strings querySetting(const string & name, const Strings & def);