diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-02-14 19:05:45 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-14 19:05:45 +0100 |
| commit | 7edafc884c2a21258541b17a231051702c458263 (patch) | |
| tree | d4202c8d6516bacd32fa55ee23c54b069ef8abd6 /gnu/packages/lxqt.scm | |
| parent | 89da127035737bdf922bc566970c5506c2e01b00 (diff) | |
| parent | 64fc4f3705423c83c680a95d8dea81a39fce9a70 (diff) | |
| download | guix-patches-7edafc884c2a21258541b17a231051702c458263.tar guix-patches-7edafc884c2a21258541b17a231051702c458263.tar.gz | |
Merge branch 'master' into core-updates
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" |