From 8cc5d3dc4d3c66d19d14b65f75afbfe4a695b6af Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Mon, 2 Sep 2019 16:06:59 +0200 Subject: gnu: xfce4-panel: Fix tzdata path. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xfce.scm (xfce4-panel)[inputs]: Add tzdata. [arguments] Add Fix-tzdata-path phase. Signed-off-by: Ludovic Courtès --- gnu/packages/xfce.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 512ca35fe9..0487c24b68 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -37,6 +37,7 @@ (define-module (gnu packages xfce) #: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 @@ (define-public xfce4-panel "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 @@ (define-public xfce4-panel `(("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) -- cgit v1.2.3