02/02: gnu: libical: Correct zoneinfo search path.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 22c161d0a881bd86f02494c5512ee6310d326b4d
Author: Kei Yamashita <address@hidden>
Date:   Tue May 10 16:56:42 2016 -0400

    gnu: libical: Correct zoneinfo search path.
    
    * gnu/packages/calendar.scm (libical)[arguments]: substitute FHS-compliant
    zoneinfo folders with location of tzdata's zoneinfo folder.
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 gnu/packages/calendar.scm |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 5ef5ec9..5ddd358 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 David Thompson <address@hidden>
 ;;; Copyright © 2015, 2016 Leo Famulari <address@hidden>
+;;; Copyright © 2016 Kei Yamashita <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,11 +48,23 @@
                 "14lmjj63zyx88rf1z71l0v9ms4c2vpdhmixksjjxgywp5p2f7708"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:tests? #f)) ; test suite appears broken
+     '(#:tests? #f ; test suite appears broken
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-paths
+           (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"))))
+             #t)))))
     (native-inputs
      `(("perl" ,perl)))
     (inputs
-     `(("icu4c" ,icu4c)))
+     `(("icu4c" ,icu4c)
+       ("tzdata" ,tzdata)))
     (home-page "https://libical.github.io/libical/";)
     (synopsis "iCalendar protocols and data formats implementation")
     (description