From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJIUt-0006b5-Gm for guix-patches@gnu.org; Thu, 17 May 2018 08:59:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJIUo-0006p3-Je for guix-patches@gnu.org; Thu, 17 May 2018 08:59:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:58383) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJIUo-0006oz-G8 for guix-patches@gnu.org; Thu, 17 May 2018 08:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fJIUo-0006Fh-69 for guix-patches@gnu.org; Thu, 17 May 2018 08:59:02 -0400 Subject: [bug#31484] [PATCH] gnu: icu4c: Patch zoneinfo directory. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJIUU-0006Il-At for guix-patches@gnu.org; Thu, 17 May 2018 08:58:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJIUP-0006ik-Cy for guix-patches@gnu.org; Thu, 17 May 2018 08:58:42 -0400 Received: from mira.cbaines.net ([2a01:7e00::f03c:91ff:fe69:8da9]:54220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJIUP-0006iW-75 for guix-patches@gnu.org; Thu, 17 May 2018 08:58:37 -0400 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 7B5D816241 for ; Thu, 17 May 2018 13:58:35 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id cad5fc0e for ; Thu, 17 May 2018 12:58:34 +0000 (UTC) From: Christopher Baines Date: Thu, 17 May 2018 13:58:34 +0100 Message-Id: <20180517125834.7417-1-mail@cbaines.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31484@debbugs.gnu.org Replace the hardcoded /usr/share/zoneinfo file with a reference to the tzdata package. * gnu/packages/icu4c.scm (icu4c)[inputs]: Add tzdata. [arguments]: Add a patch-zoneinfo-directory phase. --- gnu/packages/icu4c.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 57e8fffb3..d34b61745 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -22,6 +22,7 @@ (define-module (gnu packages icu4c) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages perl) #:use-module (guix licenses) #:use-module (guix packages) @@ -45,7 +46,8 @@ (base32 "065l3n0q9wqaw8dz20x82srshhm6i987fr9ync5xf9mr6n7ylwzh")))) (build-system gnu-build-system) (inputs - `(("perl" ,perl))) + `(("perl" ,perl) + ("tzdata" ,tzdata))) (arguments `(#:configure-flags '("--enable-rpath" @@ -58,7 +60,13 @@ #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-to-source - (lambda _ (chdir "source") #t))))) + (lambda _ (chdir "source") #t)) + (add-after 'chdir-to-source 'patch-zoneinfo-directory + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "common/putil.cpp" + (("\\/usr\\/share\\/zoneinfo") + (string-append (assoc-ref inputs "tzdata") + "/share/zoneinfo")))))))) (synopsis "International Components for Unicode") (description "ICU is a set of C/C++ and Java libraries providing Unicode and -- 2.16.3