12/16: gnu: lxqt-config: Fixing keyboard layout.

[guix-commits]

mbakke pushed a commit to branch master
in repository guix.

commit 6cd07787ab371240caaf990a2e16cb48290e25d0
Author: Fakhri Sajadi <address@hidden>
AuthorDate: Wed Feb 5 13:37:23 2020 +0330

    gnu: lxqt-config: Fixing keyboard layout.
    
    * gnu/packages/lxqt.scm (lxqt-config)[inputs]: Add xkeyboard-config.
    [arguments]: Add phase to substitute xkb rule file.
    
    Signed-off-by: Marius Bakke <address@hidden>
---
 gnu/packages/lxqt.scm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 12c92e5..a440491 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2018, 2019 Meiyo Peng <address@hidden>
 ;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2019, 2020 Reza Alizadeh Majd <address@hidden>
+;;; Copyright © 2020 Fakhri Sajadi <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -379,6 +380,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 +396,14 @@ 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.
+             (let ((xkb (assoc-ref inputs "xkeyboard-config")))
+               (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"