diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-04-03 00:13:06 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-04-03 00:13:06 +0200 |
| commit | 2a0d5de5a9decd785b22dafa69aae5320231f1b7 (patch) | |
| tree | 6c532e278025fb46a94f4cb3c3a68063b7011fe1 /gnu/packages/calendar.scm | |
| parent | 41f6d18fb6ae7adebe72793c625ad4574991fa6d (diff) | |
| parent | 245575eaf33801753ac8290e077c4397b2568540 (diff) | |
| download | guix-2a0d5de5a9decd785b22dafa69aae5320231f1b7.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/calendar.scm')
| -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 977111bfe1..000b2dd62f 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))) |