Subject: [PATCH] gnu: lxqt-config: fixing keyboard layout.
From: "Fakhri Sajadi" <[email-masked]>
To: [email-masked]
Cc: [email-masked]
Date: Wed, 05 Feb 2020 13:37:23 +0330
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/lxqt.scm (lxqt-config): Add xkeyboard-config in inputs.
---
 gnu/packages/lxqt.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 12c92e52d1..e58ec70579 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -379,6 +379,7 @@ the operating system LXQt is running on.")
        ("qtx11extras" ,qtx11extras)
        ("solid" ,solid)
        ("xf86-input-libinput" ,xf86-input-libinput)
+       ("xkeyboard-config" ,xkeyboard-config)
        ("zlib" ,zlib)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -394,6 +395,15 @@ the operating system LXQt is running on.")
                (("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
                 "DESTINATION \"etc/xdg"))
              #t))
+         (add-after 'unpack 'set-xkeyboard-config-file-name
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Set the file name to xkeyboard-config and kbd.
+             (let ((xkb (assoc-ref inputs "xkeyboard-config"))
+                   (kbd (assoc-ref inputs "kbd")))
+               (substitute* "lxqt-config-input/keyboardlayoutconfig.h"
+                (("/usr/share/X11/xkb/rules/base.lst")
+                  (string-append xkb "/share/X11/xkb/rules/base.lst")))
+             #t)))
          (add-after 'unpack 'patch-translations-dir
            (lambda* (#:key outputs #:allow-other-keys)
              (substitute* '("lxqt-config-file-associations/CMakeLists.txt"