diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-19 18:34:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 18:34:43 +0100 |
| commit | 337b3f902287bfd1885d2cd2cdeb02515ddb1931 (patch) | |
| tree | 0d9bc374014a148bbc65f00df5f6acf2fac859c0 /pkgs/tools | |
| parent | 7539f489b4811a7f6bf6d28f8d7044a7204fc1e4 (diff) | |
| parent | a6123808ccfd590ed5a3fd9fe4aacb18a1ddb51e (diff) | |
Merge pull request #109649 from berberman/fix-fcitx5
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx5/with-addons.nix | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index e049930488993..30b08a13ade48 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 = [ diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix index 854020effeaa8..17501d5f36220 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" + ln -s $out/$desktop $out/$autostart ''; meta = fcitx5.meta; |