[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
155/155: installer: Add alternate method of finding TZDIR.
From: |
John Darrington |
Subject: |
155/155: installer: Add alternate method of finding TZDIR. |
Date: |
Wed, 21 Dec 2016 20:48:43 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 56a70727121a110c2752b459c21112436466e8ef
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
- 124/155: doc: Replace fingerprint of OpenPGP signing key., (continued)
- 124/155: doc: Replace fingerprint of OpenPGP signing key., John Darrington, 2016/12/21
- 117/155: gnu: Fix load-extension path in packaging of guile-ncurses., John Darrington, 2016/12/21
- 143/155: gnu: nmap: Update to 7.40., John Darrington, 2016/12/21
- 146/155: gnu: xcape: Update to 1.2., John Darrington, 2016/12/21
- 141/155: gnu: msmtp: Update to 1.6.6., John Darrington, 2016/12/21
- 150/155: gnu: mlt: Update to 6.4.1., John Darrington, 2016/12/21
- 154/155: gnu: coq: Build coqide, John Darrington, 2016/12/21
- 147/155: gnu: xcb-util-xrm: Update to 1.2., John Darrington, 2016/12/21
- 148/155: gnu: xf86-video-vmware: Update to 13.2.1., John Darrington, 2016/12/21
- 153/155: gnu: lablgtk: use ocamlfind in installation, John Darrington, 2016/12/21
- 155/155: installer: Add alternate method of finding TZDIR.,
John Darrington <=
- 89/155: Revert "gnu: linux-libre: Update to 4.9.", John Darrington, 2016/12/21
- 122/155: Update NEWS., John Darrington, 2016/12/21
- 01/155: gnu: Add graphical installer, John Darrington, 2016/12/21
- 33/155: doc: Update dot graphs., John Darrington, 2016/12/21
- 142/155: gnu: linux-libre: Avoid invalid "kconfig" input on armhf and mips64el., John Darrington, 2016/12/21
- 113/155: gnu: hunspell: Update to 1.5.4., John Darrington, 2016/12/21
- 114/155: gnu: hunspell: Add missing perl dependency., John Darrington, 2016/12/21
- 131/155: import: github: Use 'json-fetch'., John Darrington, 2016/12/21
- 151/155: Revert "gnu: curl: Update replacement to 7.52.0 [fixes CVE-2016-{9586, 9952, 9953}].", John Darrington, 2016/12/21
- 77/155: nls: Update 'pt_BR' translation., John Darrington, 2016/12/21