lfam pushed a commit to branch staging
in repository guix.
commit 62868f124cf9443a43f4ea5867da692e32e77c58
Author: Leo Famulari <l...@famulari.name>
Date: Mon Feb 19 23:47:46 2018 -0500
gnu: tzdata: Preserve directory layout from before tzdata 2018a.
tzdata 2018a instroduced some changes to the build and installation
procedures that commit e2832cdc3 failed to address. They are described
in the NEWS file.
This is a followup to commit e2832cdc3599e3bbc0362f9749835ffbae1b1944.
* gnu/packages/base.scm (tzdata)[arguments]: Set TZDEFAULT. Remove the
time-zone utility programs in a build phase.
---
gnu/packages/base.scm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 80fb0c1..f0964d7 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1097,10 +1097,8 @@ command.")
(tmp (getenv "TMPDIR")))
(list (string-append "TOPDIR=" out)
(string-append "TZDIR=" out "/share/zoneinfo")
-
- ;; Discard zic, dump, and tzselect, already
- ;; provided by glibc.
- (string-append "ETCDIR=" tmp "/etc")
+ (string-append "TZDEFAULT=" out
+ "/share/zoneinfo/localtime")
;; Likewise for the C library routines.
(string-append "LIBDIR=" tmp "/lib")
@@ -1121,6 +1119,9 @@ command.")
(lambda* (#:key outputs #:allow-other-keys)
;; Move data in the right place.
(let ((out (assoc-ref outputs "out")))
+ ;; Discard zic, dump, and tzselect, already
+ ;; provided by glibc.
+ (delete-file-recursively (string-append out "/usr"))
(symlink (string-append out "/share/zoneinfo")
(string-append out "/share/zoneinfo/posix"))
(delete-file-recursively
