From 73671c693eccdad9b1956b02ba1bd8de65fd2332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 26 May 2025 00:15:27 +0200 Subject: [PATCH] vanadium: disable fcitx5 unicode --- nix/configurations/vanadium/nixos/overlay.nix | 1 + .../patches/fcitx5/disable-unicode.patch | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 nix/configurations/vanadium/nixos/patches/fcitx5/disable-unicode.patch diff --git a/nix/configurations/vanadium/nixos/overlay.nix b/nix/configurations/vanadium/nixos/overlay.nix index dec7deb7..3acdc8d0 100644 --- a/nix/configurations/vanadium/nixos/overlay.nix +++ b/nix/configurations/vanadium/nixos/overlay.nix @@ -31,5 +31,6 @@ in fcitx5.__output.patches.__append = [ ./patches/fcitx5/disable-clipboard.patch ./patches/fcitx5/disable-quickphrase.patch + ./patches/fcitx5/disable-unicode.patch ]; }) diff --git a/nix/configurations/vanadium/nixos/patches/fcitx5/disable-unicode.patch b/nix/configurations/vanadium/nixos/patches/fcitx5/disable-unicode.patch new file mode 100644 index 00000000..8b49d39e --- /dev/null +++ b/nix/configurations/vanadium/nixos/patches/fcitx5/disable-unicode.patch @@ -0,0 +1,41 @@ +diff --git a/src/modules/unicode/CMakeLists.txt b/src/modules/unicode/CMakeLists.txt +index 73f7e064..afddabee 100644 +--- a/src/modules/unicode/CMakeLists.txt ++++ b/src/modules/unicode/CMakeLists.txt +@@ -1,11 +1,11 @@ +-add_fcitx5_addon(unicode unicode.cpp charselectdata.cpp) +-target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard ${FMT_TARGET}) +-install(TARGETS unicode DESTINATION "${FCITX_INSTALL_ADDONDIR}") ++# add_fcitx5_addon(unicode unicode.cpp charselectdata.cpp) ++# target_link_libraries(unicode Fcitx5::Core Fcitx5::Module::Clipboard ${FMT_TARGET}) ++# install(TARGETS unicode DESTINATION "${FCITX_INSTALL_ADDONDIR}") + configure_file(unicode.conf.in.in unicode.conf.in @ONLY) + fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/unicode.conf.in unicode.conf) +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unicode.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon" +- COMPONENT config) ++# install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unicode.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon" ++# COMPONENT config) + fcitx5_export_module(Unicode TARGET unicode BUILD_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}" HEADERS unicode_public.h INSTALL) + +-install(FILES charselectdata DESTINATION "${FCITX_INSTALL_PKGDATADIR}/unicode" COMPONENT config) ++# install(FILES charselectdata DESTINATION "${FCITX_INSTALL_PKGDATADIR}/unicode" COMPONENT config) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index 97eed1f3..ff902c88 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -134,10 +134,10 @@ add_dependencies(testemoji emoji emoji.conf.in-fmt) + add_test(NAME testemoji COMMAND testemoji) + endif() + +-add_executable(testunicode testunicode.cpp) +-target_link_libraries(testunicode Fcitx5::Core Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM) +-add_dependencies(testunicode copy-addon unicode testui testfrontend testim) +-add_test(NAME testunicode COMMAND testunicode) ++# add_executable(testunicode testunicode.cpp) ++# target_link_libraries(testunicode Fcitx5::Core Fcitx5::Module::TestFrontend Fcitx5::Module::TestIM) ++# add_dependencies(testunicode copy-addon unicode testui testfrontend testim) ++# add_test(NAME testunicode COMMAND testunicode) + + + if (ENABLE_KEYBOARD)