From patchwork Mon Sep 2 14:06:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: L p R n d n X-Patchwork-Id: 15211 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A651817348; Mon, 2 Sep 2019 15:11:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6D94817320 for ; Mon, 2 Sep 2019 15:11:23 +0100 (BST) Received: from localhost ([::1]:36996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4n3C-0003nB-RH for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 10:11:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56771) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4mzz-0000gx-KZ for guix-patches@gnu.org; Mon, 02 Sep 2019 10:08:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4mzy-0000mA-L3 for guix-patches@gnu.org; Mon, 02 Sep 2019 10:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49788) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4mzy-0000m4-IW for guix-patches@gnu.org; Mon, 02 Sep 2019 10:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4mzy-0004GA-Co for guix-patches@gnu.org; Mon, 02 Sep 2019 10:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37275] [PATCH 10/19] gnu: xfce4-panel: Fix tzdata path. Resent-From: L p R n d n Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 14:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37275 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37275@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156743323716316 (code B ref -1); Mon, 02 Sep 2019 14:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Sep 2019 14:07:17 +0000 Received: from localhost ([127.0.0.1]:58609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4mzE-0004F2-Jj for submit@debbugs.gnu.org; Mon, 02 Sep 2019 10:07:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:42939) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4mzC-0004Ev-CF for submit@debbugs.gnu.org; Mon, 02 Sep 2019 10:07:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56664) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4mz8-0008GT-7z for guix-patches@gnu.org; Mon, 02 Sep 2019 10:07:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4mz6-0007gn-6t for guix-patches@gnu.org; Mon, 02 Sep 2019 10:07:10 -0400 Received: from mout01.posteo.de ([185.67.36.141]:49860) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i4mz6-0007fQ-1o for guix-patches@gnu.org; Mon, 02 Sep 2019 10:07:08 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 49758160070 for ; Mon, 2 Sep 2019 16:07:06 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 46MX2c5XX4z6tmR for ; Mon, 2 Sep 2019 16:07:04 +0200 (CEST) From: L p R n d n Date: Mon, 2 Sep 2019 16:06:59 +0200 Message-Id: <20190902140659.2506-1-guix@lprndn.info> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 1a6de2e781..13a4cfd6ef 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) @@ -309,6 +310,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) @@ -317,7 +327,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)