mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-22 02:07:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libical: Fix substitution of path to time zone database.

Browse source 
Fixes <https://bugs.gnu.org/26039>.

This is a followup to commit 2b193389d2.

* gnu/packages/calendar.scm (arguments): Update 'patch-paths' phase.
This commit is contained in:
Leo Famulari 2017-03-12 16:37:02 -04:00
parent 3ffaec136f
commit be81133a13
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/calendar.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org> ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
@ -64,10 +64,11 @@ (define-public libical
(lambda _ (lambda _
(let ((tzdata (assoc-ref %build-inputs "tzdata"))) (let ((tzdata (assoc-ref %build-inputs "tzdata")))
(substitute* "src/libical/icaltz-util.c" (substitute* "src/libical/icaltz-util.c"
(("char \\*search_paths \\[\\] =.*$") (("\\\"/usr/share/zoneinfo\\\",")
(string-append (string-append "\"" tzdata "/share/zoneinfo\""))
"char *search_paths [] = " (("\\\"/usr/lib/zoneinfo\\\",") "")
"{\"" tzdata "/share/zoneinfo\"};\n")))) (("\\\"/etc/zoneinfo\\\",") "")
(("\\\"/usr/share/lib/zoneinfo\\\"") "")))
#t))))) #t)))))
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))