From bd58c92c2de9a52881e660d6057ebae3f6376a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 26 May 2025 00:08:20 +0200 Subject: [PATCH] vanadium: disable fcitx5 clipboard --- nix/configurations/vanadium/nixos/overlay.nix | 3 ++ .../patches/fcitx5/disable-clipboard.patch | 45 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 nix/configurations/vanadium/nixos/patches/fcitx5/disable-clipboard.patch diff --git a/nix/configurations/vanadium/nixos/overlay.nix b/nix/configurations/vanadium/nixos/overlay.nix index 60d6b627..85a4fd37 100644 --- a/nix/configurations/vanadium/nixos/overlay.nix +++ b/nix/configurations/vanadium/nixos/overlay.nix @@ -28,4 +28,7 @@ in (lib.cmakeFeature "ENABLE_EMOJI" "Off") (lib.cmakeFeature "ENABLE_WAYLAND" "Off") ]; + fcitx5.__output.patches.__append = [ + ./patches/fcitx5/disable-clipboard.patch + ]; }) diff --git a/nix/configurations/vanadium/nixos/patches/fcitx5/disable-clipboard.patch b/nix/configurations/vanadium/nixos/patches/fcitx5/disable-clipboard.patch new file mode 100644 index 00000000..4ad25570 --- /dev/null +++ b/nix/configurations/vanadium/nixos/patches/fcitx5/disable-clipboard.patch @@ -0,0 +1,45 @@ +diff --git a/src/modules/clipboard/CMakeLists.txt b/src/modules/clipboard/CMakeLists.txt +index 997c4e3e..4163cada 100644 +--- a/src/modules/clipboard/CMakeLists.txt ++++ b/src/modules/clipboard/CMakeLists.txt +@@ -1,21 +1,21 @@ +-add_fcitx5_addon(clipboard) +- +-target_sources(clipboard PRIVATE clipboard.cpp) +-target_link_libraries(clipboard Fcitx5::Core) +- +-if (ENABLE_X11) +- target_sources(clipboard PRIVATE xcbclipboard.cpp) +- target_link_libraries(clipboard Fcitx5::Module::XCB XCB::XCB) +-endif() +- +-if (WAYLAND_FOUND) +- target_sources(clipboard PRIVATE waylandclipboard.cpp) +- target_link_libraries(clipboard Fcitx5::Module::Wayland Fcitx5::Wayland::WLRDataControl Pthread::Pthread) +-endif() +- +-install(TARGETS clipboard DESTINATION "${FCITX_INSTALL_ADDONDIR}") +-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/clipboard.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon" +- COMPONENT config) ++# add_fcitx5_addon(clipboard) ++# ++# target_sources(clipboard PRIVATE clipboard.cpp) ++# target_link_libraries(clipboard Fcitx5::Core) ++# ++# if (ENABLE_X11) ++# target_sources(clipboard PRIVATE xcbclipboard.cpp) ++# target_link_libraries(clipboard Fcitx5::Module::XCB XCB::XCB) ++# endif() ++# ++# if (WAYLAND_FOUND) ++# target_sources(clipboard PRIVATE waylandclipboard.cpp) ++# target_link_libraries(clipboard Fcitx5::Module::Wayland Fcitx5::Wayland::WLRDataControl Pthread::Pthread) ++# endif() ++# ++# install(TARGETS clipboard DESTINATION "${FCITX_INSTALL_ADDONDIR}") ++# install(FILES "${CMAKE_CURRENT_BINARY_DIR}/clipboard.conf" DESTINATION "${FCITX_INSTALL_PKGDATADIR}/addon" ++# COMPONENT config) + configure_file(clipboard.conf.in.in clipboard.conf.in @ONLY) + fcitx5_translate_desktop_file(${CMAKE_CURRENT_BINARY_DIR}/clipboard.conf.in clipboard.conf) + fcitx5_export_module(Clipboard TARGET clipboard BUILD_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}" HEADERS clipboard_public.h INSTALL) +