summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-05-07 15:26:36 +0200
committerLudovic Courtès <ludo@gnu.org>2019-05-07 15:46:53 +0200
commit1df38cfcc78b750567f292a173e43a2633757cb0 (patch)
tree699864c8ad806cf61a023a6b38471eef720a2dc8 /gnu/packages
parentd108f59761f6581bff0d405c38852688ba04961d (diff)
downloadguix-patches-1df38cfcc78b750567f292a173e43a2633757cb0.tar
guix-patches-1df38cfcc78b750567f292a173e43a2633757cb0.tar.gz
gnu: gnome-control-center: Patch file name of 'gkbd-keyboard-display'.
Fixes <https://bugs.gnu.org/35605>. Reported by sirgazil <sirgazil@zoho.com>. * gnu/packages/gnome.scm (gnome-control-center)[arguments]: In 'patch-paths' phase, patch "cc-region-panel.cc" and provide it with the absolute file name of 'gkbd-keyboard-display'.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/gnome.scm8
1 files changed, 7 insertions, 1 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 692a215e0d..3e51e9cf9b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5837,13 +5837,18 @@ devices using the GNOME desktop.")
(add-before 'configure 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
(let ((libc (assoc-ref inputs "libc"))
- (tzdata (assoc-ref inputs "tzdata")))
+ (tzdata (assoc-ref inputs "tzdata"))
+ (libgnomekbd (assoc-ref inputs "libgnomekbd")))
(substitute* "panels/datetime/tz.h"
(("/usr/share/zoneinfo/zone.tab")
(string-append tzdata "/share/zoneinfo/zone.tab")))
(substitute* "panels/datetime/test-endianess.c"
(("/usr/share/locale")
(string-append libc "/share/locale")))
+ (substitute* "panels/region/cc-region-panel.c"
+ (("\"gkbd-keyboard-display")
+ (string-append "\"" libgnomekbd
+ "/bin/gkbd-keyboard-display")))
#t))))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
@@ -5867,6 +5872,7 @@ devices using the GNOME desktop.")
("grilo" ,grilo)
("ibus" ,ibus)
("libcanberra" ,libcanberra)
+ ("libgnomekbd" ,libgnomekbd)
("libgudev" ,libgudev)
("libgtop" ,libgtop)
("libpwquality" ,libpwquality)