Don't define builtins.{currentSystem,currentTime} in pure mode

This makes it easier to provide a default, e.g. system = builtins.currentSystem or "x86_64-linux";
NixOS · Jan 18, 2018 · 0c95776 · 0c95776
1 parent 5647e55
commit 0c95776
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/release.nix b/release.nix
@@ -6,7 +6,7 @@
 
 let
 
-  pkgs = import nixpkgs { system = "x86_64-linux"; };
+  pkgs = import nixpkgs { system = builtins.currentSystem or "x86_64-linux"; };
 
   jobs = rec {
 

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
@@ -1997,16 +1997,12 @@ void EvalState::createBaseEnv()
         addConstant(name, v);
     };
 
-    if (settings.pureEval)
-        addPurityError("__currentTime");
-    else {
+    if (!settings.pureEval) {
         mkInt(v, time(0));
         addConstant("__currentTime", v);
     }
 
-    if (settings.pureEval)
-        addPurityError("__currentSystem");
-    else {
+    if (!settings.pureEval) {
         mkString(v, settings.thisSystem);
         addConstant("__currentSystem", v);
     }