about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-07-31 17:12:53 +0200
committeraszlig <aszlig@redmoonstudios.org>2017-07-31 17:15:30 +0200
commit4f901203e8d1a0ded90a73e2670ce493ed051299 (patch)
tree5eff448578fe0e3f2d3b7975e2c6f6a9b57ef4c7 /nixos
parent4ed291b3037d18c97edaed35cbeb4f8ecc224e16 (diff)
downloadnixlib-4f901203e8d1a0ded90a73e2670ce493ed051299.tar
nixlib-4f901203e8d1a0ded90a73e2670ce493ed051299.tar.gz
nixlib-4f901203e8d1a0ded90a73e2670ce493ed051299.tar.bz2
nixlib-4f901203e8d1a0ded90a73e2670ce493ed051299.tar.lz
nixlib-4f901203e8d1a0ded90a73e2670ce493ed051299.tar.xz
nixlib-4f901203e8d1a0ded90a73e2670ce493ed051299.tar.zst
nixlib-4f901203e8d1a0ded90a73e2670ce493ed051299.zip
nixos/timezone: Fix evaluation error
Evaluation error introduced in a0d464033c2bacffa9c05d27903fb03cd09ace46.

If the value for timeZone is null it shouldn't be even tried to coerce
it into a string.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @lheckemann, @joachifm
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/config/timezone.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index 9f849c24c113..aa030a816d04 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -47,7 +47,7 @@ in
 
     environment.etc = {
       zoneinfo.source = tzdir;
-    } // lib.optionalAttrs (config.time.timeZone == null) {
+    } // lib.optionalAttrs (config.time.timeZone != null) {
         localtime.source = "/etc/zoneinfo/${config.time.timeZone}";
         localtime.mode = "direct-symlink";
       };