diff options
| author | Leo Famulari <leo@famulari.name> | 2017-03-12 16:37:02 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-03-12 20:45:46 -0400 |
| commit | be81133a13932bc83b0697d73581a47674ef6987 (patch) | |
| tree | 8451b5f9dada3cc1a8ad271e846e6857190e6176 | |
| parent | 3ffaec136fab017e6cc094287da207cf30f05974 (diff) | |
| download | guix-be81133a13932bc83b0697d73581a47674ef6987.tar guix-be81133a13932bc83b0697d73581a47674ef6987.tar.gz | |
gnu: libical: Fix substitution of path to time zone database.
Fixes <https://bugs.gnu.org/26039>.
This is a followup to commit 2b193389d243c469e159d0ab5dfc86b5867db05d.
* gnu/packages/calendar.scm (arguments): Update 'patch-paths' phase.
| -rw-r--r-- | gnu/packages/calendar.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 1e9a93ca93..d7260b5f42 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; 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 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com> @@ -64,10 +64,11 @@ (lambda _ (let ((tzdata (assoc-ref %build-inputs "tzdata"))) (substitute* "src/libical/icaltz-util.c" - (("char \\*search_paths \\[\\] =.*$") - (string-append - "char *search_paths [] = " - "{\"" tzdata "/share/zoneinfo\"};\n")))) + (("\\\"/usr/share/zoneinfo\\\",") + (string-append "\"" tzdata "/share/zoneinfo\"")) + (("\\\"/usr/lib/zoneinfo\\\",") "") + (("\\\"/etc/zoneinfo\\\",") "") + (("\\\"/usr/share/lib/zoneinfo\\\"") ""))) #t))))) (native-inputs `(("perl" ,perl))) |