nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Ludovic Courtès 2019-05-07 15:26:36 +02:00
parent d108f59761
commit 1df38cfcc7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/gnome.scm
View File

@ -5837,13 +5837,18 @@ devices using the GNOME desktop.")
(add-before 'configure 'patch-paths (add-before 'configure 'patch-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((libc (assoc-ref inputs "libc")) (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" (substitute* "panels/datetime/tz.h"
(("/usr/share/zoneinfo/zone.tab") (("/usr/share/zoneinfo/zone.tab")
(string-append tzdata "/share/zoneinfo/zone.tab"))) (string-append tzdata "/share/zoneinfo/zone.tab")))
(substitute* "panels/datetime/test-endianess.c" (substitute* "panels/datetime/test-endianess.c"
(("/usr/share/locale") (("/usr/share/locale")
(string-append libc "/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)))))) #t))))))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
@ -5867,6 +5872,7 @@ devices using the GNOME desktop.")
("grilo" ,grilo) ("grilo" ,grilo)
("ibus" ,ibus) ("ibus" ,ibus)
("libcanberra" ,libcanberra) ("libcanberra" ,libcanberra)
("libgnomekbd" ,libgnomekbd)
("libgudev" ,libgudev) ("libgudev" ,libgudev)
("libgtop" ,libgtop) ("libgtop" ,libgtop)
("libpwquality" ,libpwquality) ("libpwquality" ,libpwquality)