diff options
| author | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-23 14:53:44 +0200 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2020-09-23 14:53:44 +0200 |
| commit | 1828958db52d0019a7f3d763b07e64f78afa2cbf (patch) | |
| tree | 8bdff27c5b3dc088d923e91a14a38f6a6b9fa661 /gnu/packages/lxqt.scm | |
| parent | 7e463dd16b7e273011f0beafa57a89fa2d525f8b (diff) | |
| parent | 23744435613aa040beacc61a0825cc72280da80a (diff) | |
| download | guix-1828958db52d0019a7f3d763b07e64f78afa2cbf.tar.gz guix-1828958db52d0019a7f3d763b07e64f78afa2cbf.zip | |
Merge branch 'wip-lisp' into staging
Diffstat (limited to 'gnu/packages/lxqt.scm')
| -rw-r--r-- | gnu/packages/lxqt.scm | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 21587609ce..af452a9903 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -591,7 +591,8 @@ of other programs.") ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) ("solid" ,solid) - ("xcb-util" ,xcb-util))) + ("xcb-util" ,xcb-util) + ("xkeyboard-config" ,xkeyboard-config))) (native-inputs `(("pkg-config" ,pkg-config) ("lxqt-build-tools" ,lxqt-build-tools) @@ -619,7 +620,15 @@ of other programs.") (("\\$\\{LXQT_TRANSLATIONS_DIR\\}") (string-append (assoc-ref outputs "out") "/share/lxqt/translations"))) - #t))))) + #t)) + (add-after 'unpack 'set-xkeyboard-config-file-path + (lambda* (#:key inputs #:allow-other-keys) + ;; Set the path to xkeyboard-config. + (let ((xkb (assoc-ref inputs "xkeyboard-config"))) + (substitute* "plugin-kbindicator/src/x11/kbdlayout.cpp" + (("/usr/share/X11/xkb/rules/evdev.xml") + (string-append xkb "/share/X11/xkb/rules/evdev.xml"))) + #t)))))) (home-page "https://lxqt.github.io") (synopsis "The LXQt desktop panel") (description "lxqt-panel represents the taskbar of LXQt.") |