GNU bug report logs - #39435
[PATCH] gnu: lxqt-config: fixing keyboard layout.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 39435 in the body.
You can then email your comments to 39435 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Fakhri Sajadi" <f.sajadi <at> pantherx.org>
To: guix-patches <at> gnu.org
Cc: f.sajadi <at> pantherx.org
Subject: [PATCH] gnu: lxqt-config: fixing keyboard layout.
Date: Wed, 05 Feb 2020 13:37:23 +0330

* 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"

Message #10 received at 39435-done <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Fakhri Sajadi <f.sajadi <at> pantherx.org>, 39435-done <at> debbugs.gnu.org
Cc: f.sajadi <at> pantherx.org
Subject: Re: [bug#39435] [PATCH] gnu: lxqt-config: fixing keyboard layout.
Date: Wed, 05 Feb 2020 21:57:06 +0100

[Message part 1 (text/plain, inline)]

"Fakhri Sajadi" <f.sajadi <at> pantherx.org> writes:

> * gnu/packages/lxqt.scm (lxqt-config): Add xkeyboard-config in inputs.

Thanks!  I edited the commit message to more closely follow our
conventions, and also added a copyright line for you.  Let me know if
the information is incorrect.

[...]

> +         (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)))

I also removed the let binding for 'kbd' as it was unused.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.