guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/06: gnu: gnome-control-center: Patch file name of 'gkbd-keyboard-disp


From: guix-commits
Subject: 02/06: gnu: gnome-control-center: Patch file name of 'gkbd-keyboard-display'.
Date: Tue, 7 May 2019 09:47:01 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 1df38cfcc78b750567f292a173e43a2633757cb0
Author: Ludovic Court├Ęs <address@hidden>
Date:   Tue May 7 15:26:36 2019 +0200

    gnu: gnome-control-center: Patch file name of 'gkbd-keyboard-display'.
    
    Fixes <https://bugs.gnu.org/35605>.
    Reported by sirgazil <address@hidden>.
    
    * 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'.
---
 gnu/packages/gnome.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 692a215..3e51e9c 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]