[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/09: gnu: xfce4-panel: Fix tzdata path.
From: |
guix-commits |
Subject: |
09/09: gnu: xfce4-panel: Fix tzdata path. |
Date: |
Fri, 6 Sep 2019 18:39:02 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 8cc5d3dc4d3c66d19d14b65f75afbfe4a695b6af
Author: L p R n d n <address@hidden>
Date: Mon Sep 2 16:06:59 2019 +0200
gnu: xfce4-panel: Fix tzdata path.
* gnu/packages/xfce.scm (xfce4-panel)[inputs]: Add tzdata.
[arguments] Add Fix-tzdata-path phase.
Signed-off-by: Ludovic Courtès <address@hidden>
---
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 512ca35..0487c24b 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)
- branch master updated (7fc41e6 -> 8cc5d3d), guix-commits, 2019/09/06
- 01/09: gnu: ecl-net.didierverna.asdf-flv: Fix variable name., guix-commits, 2019/09/06
- 02/09: gnu: qtwebkit: Disable non-x86 builds., guix-commits, 2019/09/06
- 04/09: gnu: xfconf: Add support for gobject-introspection., guix-commits, 2019/09/06
- 06/09: gnu: xfconf: Fix tests., guix-commits, 2019/09/06
- 08/09: gnu: libxfce4ui: Add vendor., guix-commits, 2019/09/06
- 05/09: gnu: xfconf: Add vala support., guix-commits, 2019/09/06
- 07/09: gnu: libxfce4ui: Add gobject-introspection support., guix-commits, 2019/09/06
- 03/09: doc: Highlight Scheme syntax in the HTML output., guix-commits, 2019/09/06
- 09/09: gnu: xfce4-panel: Fix tzdata path.,
guix-commits <=