ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xfce4-panel: Fix tzdata path.

Browse source 
* gnu/packages/xfce.scm (xfce4-panel)[inputs]: Add tzdata.
[arguments] Add Fix-tzdata-path phase.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
L p R n d n 2019-09-02 16:06:59 +02:00 committed by Ludovic Courtès
parent 64200f0197
commit 8cc5d3dc4d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/xfce.scm
View file

@ -37,6 +37,7 @@ (define-module (gnu packages xfce)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu artwork) #:use-module (gnu artwork)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages calendar) #:use-module (gnu packages calendar)
#:use-module (gnu packages cdrom) #:use-module (gnu packages cdrom)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
@ -309,6 +310,15 @@ (define-public xfce4-panel
"1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m")) "1x3flv86jh9vqah7mr5mmfx2991mc6icsqjygsc3j88lgsyz7y6m"))
(patches (search-patches "xfce4-panel-plugins.patch")))) (patches (search-patches "xfce4-panel-plugins.patch"))))
(build-system gnu-build-system) (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 (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("intltool" ,intltool) ("intltool" ,intltool)
@ -317,7 +327,8 @@ (define-public xfce4-panel
`(("gtk+-3" ,gtk+) ; required by libxfce4panel-2.0.pc `(("gtk+-3" ,gtk+) ; required by libxfce4panel-2.0.pc
("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.pc ("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-2.0.pc
(inputs (inputs
`(("exo" ,exo) `(("tzdata" ,tzdata) ;; For fix-tzdata-path phase only.
("exo" ,exo)
("gtk+-2" ,gtk+-2) ("gtk+-2" ,gtk+-2)
("xfconf" ,xfconf) ("xfconf" ,xfconf)
("garcon" ,garcon) ("garcon" ,garcon)