From 3e43f7a57102ef65b06263d2e97e1bfbb3b56a35 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 22 Jun 2024 18:06:04 +0800 Subject: [PATCH] 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 ;;; Copyright © 2022 Dominic Martinez ;;; Copyright © 2022 dan +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -320,12 +321,18 @@ (define-public fcitx5-qt `(#: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))