JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/timezone: Fix evaluation error

Browse Source 
Evaluation error introduced in a0d464033c.

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
This commit is contained in:
aszlig 2017-07-31 17:12:53 +02:00
parent 4ed291b303
commit 4f901203e8
No known key found for this signature in database
GPG Key ID: 1DE8E48E57DB5436
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/timezone.nix
View File

@ -47,7 +47,7 @@ in
environment.etc = { environment.etc = {
zoneinfo.source = tzdir; zoneinfo.source = tzdir;
} // lib.optionalAttrs (config.time.timeZone == null) { } // lib.optionalAttrs (config.time.timeZone != null) {
localtime.source = "/etc/zoneinfo/${config.time.timeZone}"; localtime.source = "/etc/zoneinfo/${config.time.timeZone}";
localtime.mode = "direct-symlink"; localtime.mode = "direct-symlink";
}; };