me
/
guix
Archived
1
0
Fork 0
Code

gnu: tzdata: Keep using the "fat" tzdata file format. 

* gnu/packages/base.scm (tzdata)[arguments]: In #:make-flags, pass CPPFLAGS to
preserve the same on-disk format as earlier releases.
master
Marius Bakke 2020-11-07 20:09:54 +01:00
parent 2e8a9db6ef
commit fce5ce77d0
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/base.scm
View File

@ -1240,7 +1240,7 @@ command.")
"02g88pbw82zr36x9dz5ib4sq6bfq253yx5hbhnfyhp143naky1cv")))) "02g88pbw82zr36x9dz5ib4sq6bfq253yx5hbhnfyhp143naky1cv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f `(#:tests? #f
#:make-flags (let ((out (assoc-ref %outputs "out")) #:make-flags (let ((out (assoc-ref %outputs "out"))
(tmp (getenv "TMPDIR"))) (tmp (getenv "TMPDIR")))
(list (string-append "TOPDIR=" out) (list (string-append "TOPDIR=" out)
@ -1252,6 +1252,16 @@ command.")
(string-append "LIBDIR=" tmp "/lib") (string-append "LIBDIR=" tmp "/lib")
(string-append "MANDIR=" tmp "/man") (string-append "MANDIR=" tmp "/man")
;; XXX: tzdata 2020b changed the on-disk format
;; of the time zone files from 'fat' to 'slim'.
;; Many packages (particularly evolution-data-server)
;; can not yet handle the latter, so we stick with
;; 'fat' for now.
,@(if (version>=? (package-version this-package)
"2020b")
'("CPPFLAGS=-DZIC_BLOAT_DEFAULT='\"fat\"'")
'())
"AWK=awk" "AWK=awk"
"CC=gcc")) "CC=gcc"))
#:modules ((guix build utils) #:modules ((guix build utils)