Merge pull request #109649 from berberman/fix-fcitx5

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 = [

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"
+    ln -s $out/$desktop $out/$autostart
   '';
 
   meta = fcitx5.meta;