bug#39435: closed ([PATCH] gnu: lxqt-config: fixing keyboard layout.)

[GNU bug Tracking System]

Your message dated Wed, 05 Feb 2020 21:57:06 +0100
with message-id <address@hidden>
and subject line Re: [bug#39435] [PATCH] gnu: lxqt-config: fixing keyboard 
layout.
has caused the debbugs.gnu.org bug report #39435,
regarding [PATCH] gnu: lxqt-config: fixing keyboard layout.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden.)


-- 
39435: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=39435
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: lxqt-config: fixing keyboard layout.
>
>
>
>
> Date: 
>
> Wed, 05 Feb 2020 13:37:23 +0330
>
>
>
>
> User-agent: 
>
> Cyrus-JMAP/3.1.7-802-g7a41c81-fmstable-20200203v1
>
>
>
>
> * 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"
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#39435] [PATCH] gnu: lxqt-config: fixing keyboard layout. Date: Wed, 05 Feb 2020 21:57:06 +0100 User-agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu)

"Fakhri Sajadi" <address@hidden> 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
Description: PGP signature

--- End Message ---