z572 pushed a commit to branch kde-team
in repository guix.
commit 98192ef48667e0dbe321ac8ef4eaf9a0ad9b9cf4
Author: Zheng Junjie <zhengjun...@iscas.ac.cn>
AuthorDate: Sat Jun 22 18:06:04 2024 +0800
gnu: fcitx5-qt: Enable qt6 support.
* gnu/packages/fcitx5.scm (fcitx5-qt)[arguments]<#:configure-flags>: Add
CMAKE_INSTALL_QT6PLUGINDIR and ENABLE_QT6=ON.
[inputs]: Add qtbase, qtwayland, wayland.
Change-Id: I389253eb08efe765d1c79c44ac5d69717ccaf362
---
gnu/packages/fcitx5.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index aba0be21e7..c555b8ab84 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2021 Tobias Geerinckx-Rice <m...@tobias.gr>
;;; Copyright © 2022 Dominic Martinez <d...@dominicm.dev>
;;; Copyright © 2022 dan <i@dan.games>
+;;; Copyright © 2024 Zheng Junjie <873216...@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -320,12 +321,18 @@ IM module for GTK+3 applications.
`(#:configure-flags
(list (string-append "-DCMAKE_INSTALL_QT5PLUGINDIR="
%output "/lib/qt5/plugins")
- "-DENABLE_QT4=Off")))
+ (string-append "-DCMAKE_INSTALL_QT6PLUGINDIR="
+ %output "/lib/qt6/plugins")
+ "-DENABLE_QT4=Off"
+ "-DENABLE_QT6=ON")))
(inputs
`(("fcitx5" ,fcitx5)
("libxcb" ,libxcb)
("libxkbcommon" ,libxkbcommon)
- ("qtbase" ,qtbase-5)
+ ("qtbase-5" ,qtbase-5)
+ ("qtbase" ,qtbase)
+ ("qtwayland" ,qtwayland)
+ ("wayland" ,wayland)
("gettext" ,gettext-minimal)))
(native-inputs
(list extra-cmake-modules))
