13/197: installer: Add alternate method of finding TZDIR.

[Danny Milosavljevic]

dannym pushed a commit to branch wip-installer-2
in repository guix.

commit 5cc798981a30d5f4f43c897acb36fd91a112eb40
Author: John Darrington <address@hidden>
Date:   Wed Dec 21 20:28:02 2016 +0100

    installer: Add alternate method of finding TZDIR.
    
    * gnu/system/installer/new.scm (main-options): Provide alternative method 
of finding
    the timezone directory.
---
 gnu/system/installer/new.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/system/installer/new.scm b/gnu/system/installer/new.scm
index 9b18251..5646dfb 100644
--- a/gnu/system/installer/new.scm
+++ b/gnu/system/installer/new.scm
@@ -88,7 +88,10 @@
                         (lambda (page)
                           (make-tz-browser
                            page
-                     (getenv "TZDIR")
+                           (or
+                            (getenv "TZDIR")
+                            (string-append (car (slurp "guix build tzdata" #f))
+                                           "/share/zoneinfo"))
                     page-stack))))
 
     (hostname . ,(make-task hostname-menu-title
@@ -101,7 +104,7 @@
 
     (generate .  ,(make-task
                    (N_ "Generate the configuration")
-                   '(filesystems hostname timezone)
+                   '(filesystems timezone hostname)
                    (lambda () #f)
                    (lambda (page)
                      (make-dialog