commit 4f901203e8d1a0ded90a73e2670ce493ed051299 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

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

aszlig 8 years ago 4f901203 4ed291b3

options

unified split

Changed files

+1 -1

nixos

modules

config

timezone.nix

+1 -1

nixos/modules/config/timezone.nix

···

       47
       47
        
       

     

       48
       48
        
           environment.etc = {

     

       49
       49
        
             zoneinfo.source = tzdir;

     

       50
       50
       -
           } // lib.optionalAttrs (config.time.timeZone == null) {

     

       50
       50
       +
           } // lib.optionalAttrs (config.time.timeZone != null) {

     

       51
       51
        
               localtime.source = "/etc/zoneinfo/${config.time.timeZone}";

     

       52
       52
        
               localtime.mode = "direct-symlink";

     

       53
       53
        
             };