diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-02-05 22:08:06 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-05 22:08:06 +0100 |
| commit | f10921c5ade56534633eae0da94da6e81aacc2aa (patch) | |
| tree | 599d0256cc509f47a3e75ea1214d5374de51eee8 /gnu/packages/lxqt.scm | |
| parent | 0a83339bb1429332ee889e9a976aa214ae2ac0db (diff) | |
| parent | 9d0dfd9a9a7c43363a4e140c20d49f119fe6f2e3 (diff) | |
| download | guix-f10921c5ade56534633eae0da94da6e81aacc2aa.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/lxqt.scm')
| -rw-r--r-- | gnu/packages/lxqt.scm | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 12c92e52d1..a440491633 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019 Meiyo Peng <meiyo@riseup.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019, 2020 Reza Alizadeh Majd <r.majd@pantherx.org> +;;; Copyright © 2020 Fakhri Sajadi <f.sajadi@pantherx.org> ;;; ;;; 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" |