From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:42891) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0AA1-0006Xo-5c for guix-patches@gnu.org; Tue, 20 Aug 2019 15:51:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0A9y-0000Ys-Ie for guix-patches@gnu.org; Tue, 20 Aug 2019 15:51:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53505) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0A9y-0000Yl-EF for guix-patches@gnu.org; Tue, 20 Aug 2019 15:51:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0A9y-0003Xx-Ag for guix-patches@gnu.org; Tue, 20 Aug 2019 15:51:14 -0400 Subject: [bug#37121] [PATCH 15/40] gnu: xfce4-panel: Fix tzdata path. Resent-Message-ID: From: L p R n d n Date: Tue, 20 Aug 2019 23:50:18 +0200 Message-Id: <20190820215043.32077-15-guix@lprndn.info> In-Reply-To: <20190820215043.32077-1-guix@lprndn.info> References: <20190820215043.32077-1-guix@lprndn.info> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 37121@debbugs.gnu.org * gnu/packages/xfce.scm (xfce4-panel)[inputs]: Add tzdata. [arguments] Add Fix-tzdata-path phase. --- gnu/packages/xfce.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 56477adc0b..24e95fe36e 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -37,6 +37,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu artwork) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages calendar) #:use-module (gnu packages cdrom) #:use-module (gnu packages pkg-config) @@ -311,6 +312,15 @@ management D-Bus specification.") "1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'Fix-tzdata-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (string-append "plugins/clock/clock.c") + (("/usr/share/zoneinfo") + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) @@ -319,7 +329,8 @@ management D-Bus specification.") `(("gtk+-3" ,gtk+) ; required by libxfce4panel-2.0.pc ("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.pc (inputs - `(("exo" ,exo) + `(("tzdata" ,tzdata) ;; For Fix-tzdata-path phase only. + ("exo" ,exo) ("gtk+-2" ,gtk+-2) ("xfconf" ,xfconf) ("garcon" ,garcon) -- 2.22.0