diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-01-18 16:37:39 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2018-01-18 16:38:48 +0100 |
commit | 0c95776c3efdc63c4b957823d4e51d851a64ed84 (patch) | |
tree | cb06e2336002f760ce0bba427f1c859e7a6ec4e6 /src/libexpr | |
parent | 5647e55f65a69bfb4a44fb2dfb6d7fd870b4dd38 (diff) |
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";
Diffstat (limited to 'src/libexpr')
-rw-r--r-- | src/libexpr/primops.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index e90a1da25..975f0e830 100644 --- 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); } |