~ruther/guix-local

be81133a13932bc83b0697d73581a47674ef6987 — Leo Famulari 9 years ago 3ffaec1
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.
1 files changed, 6 insertions(+), 5 deletions(-)

M gnu/packages/calendar.scm
M gnu/packages/calendar.scm => gnu/packages/calendar.scm +6 -5
@@ 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)))