From 9509da46e79015088f7e5724f1c31b348ecdf179 Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Mon, 18 Jan 2021 00:52:53 +0800
Subject: [PATCH 1/4] fcitx5-qt: fix missing
libfcitx5platforminputcontextplugin.so
---
pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index e04993048899..ad4fd1fa6173 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -7,6 +7,7 @@
, qtx11extras
, libxcb
, libXdmcp
+, qtbase
}:
mkDerivation rec {
@@ -20,8 +21,14 @@ mkDerivation rec {
sha256 = "BVOumk2xj3vmwmm4KwiktQhWyTuUA2OFwYXNR6HgwyM=";
};
+ preConfigure = ''
+ substituteInPlace qt5/platforminputcontext/CMakeLists.txt \
+ --replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix}
+ '';
+
cmakeFlags = [
"-DENABLE_QT4=0"
+ "-DENABLE_QT6=0"
];
nativeBuildInputs = [
@@ -34,6 +41,7 @@ mkDerivation rec {
qtx11extras
libxcb
libXdmcp
+ qtbase
];
meta = with lib; {
From 61615cc4ea7cb87e184a673d05a3201963c6a16c Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Mon, 18 Jan 2021 00:53:58 +0800
Subject: [PATCH 2/4] fcitx5-with-addons: patch .desktop files
---
pkgs/tools/inputmethods/fcitx5/with-addons.nix | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
index 854020effeaa..2ee363f4fece 100644
--- a/pkgs/tools/inputmethods/fcitx5/with-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
@@ -12,6 +12,14 @@ symlinkJoin {
--prefix FCITX_ADDON_DIRS : "$out/lib/fcitx5" \
--suffix XDG_DATA_DIRS : "$out/share" \
--suffix PATH : "$out/bin"
+
+ desktop=share/applications/org.fcitx.Fcitx5.desktop
+ autostart=etc/xdg/autostart/org.fcitx.Fcitx5.desktop
+ rm $out/$desktop
+ rm $out/$autostart
+ cp ${fcitx5}/$desktop $out/$desktop
+ sed -i $out/$desktop -e "s|^Exec=.*|Exec=$out/bin/fcitx5|g"
+ cp $out/$desktop $out/$autostart
'';
meta = fcitx5.meta;
From 9e58c856a0f73529bef7b0c260c9c3290b02b85a Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Mon, 18 Jan 2021 10:20:50 +0800
Subject: [PATCH 3/4] fcitx5-with-addons: symlink .desktop to autostart
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
pkgs/tools/inputmethods/fcitx5/with-addons.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
index 2ee363f4fece..17501d5f3622 100644
--- a/pkgs/tools/inputmethods/fcitx5/with-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix
@@ -19,7 +19,7 @@ symlinkJoin {
rm $out/$autostart
cp ${fcitx5}/$desktop $out/$desktop
sed -i $out/$desktop -e "s|^Exec=.*|Exec=$out/bin/fcitx5|g"
- cp $out/$desktop $out/$autostart
+ ln -s $out/$desktop $out/$autostart
'';
meta = fcitx5.meta;
From a6123808ccfd590ed5a3fd9fe4aacb18a1ddb51e Mon Sep 17 00:00:00 2001
From: Potato Hatsue <1793913507@qq.com>
Date: Mon, 18 Jan 2021 10:33:18 +0800
Subject: [PATCH 4/4] fcitx5-with-addons: remove unnecessary qtbase from
buildInputs
---
pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index ad4fd1fa6173..30b08a13ade4 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -41,7 +41,6 @@ mkDerivation rec {
qtx11extras
libxcb
libXdmcp
- qtbase
];
meta = with lib; {