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

[Leo Famulari]

lfam pushed a commit to branch core-updates
in repository guix.

commit be81133a13932bc83b0697d73581a47674ef6987
Author: Leo Famulari <address@hidden>
Date:   Sun Mar 12 16:37:02 2017 -0400

    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.
---
 gnu/packages/calendar.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 1e9a93c..d7260b5 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 <address@hidden>
-;;; Copyright © 2015, 2016 Leo Famulari <address@hidden>
+;;; Copyright © 2015, 2016, 2017 Leo Famulari <address@hidden>
 ;;; Copyright © 2016 Kei Kebreau <address@hidden>
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016 Troy Sankey <address@hidden>
@@ -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)))