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 e2832cdc35.

* gnu/packages/base.scm (tzdata)[arguments]: Set TZDEFAULT. Remove the
time-zone utility programs in a build phase.
This commit is contained in:
Leo Famulari 2018-02-19 23:47:46 -05:00
parent 3c747a080f
commit 62868f124c
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08

View file

@ -1097,10 +1097,8 @@ (define-public tzdata
(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 @@ (define-public tzdata
(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