From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [PATCH] gnu: Correct libical zoneinfo search path. Date: Tue, 10 May 2016 15:36:19 +0200 Message-ID: <87h9e6ghm4.fsf@gnu.org> References: <20160510000616.4a9522e2@openmailbox.org> <20160510000811.42fc6522@openmailbox.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b07pr-0001F8-E6 for guix-devel@gnu.org; Tue, 10 May 2016 09:36:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b07pn-0007Qn-4L for guix-devel@gnu.org; Tue, 10 May 2016 09:36:26 -0400 In-Reply-To: <20160510000811.42fc6522@openmailbox.org> (Kei Yamashita's message of "Tue, 10 May 2016 00:08:11 -0400") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Kei Yamashita Cc: guix-devel@gnu.org Hi, Good catch! Kei Yamashita skribis: > + (modify-phases %standard-phases > + (add-before 'configure 'patch-paths > + (lambda _ > + (let ((tzdata (assoc-ref %build-inputs "tzdata"))) > + (substitute* "src/libical/icaltz-util.c" > + (((string-append "\"/usr/share/zoneinfo\"," > + "\"/usr/lib/zoneinfo\"," > + "\"/etc/zoneinfo\"," > + "\"/usr/share/lib/zoneinfo\"")) > + (string-append "\"" tzdata "/share/zoneinfo\"")))) Could you use a literal string for the pattern? Maybe something like =E2=80=9Cchar \*foo =3D.*$=E2=80=9D would be clearer? Otherwise LGTM, thanks! Ludo=E2=80=99.