Merge branch 'master' into flip-map-foreach

pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix

@@ -21,15 +21,15 @@ mkDerivation rec {
 
   buildInputs = [ fcitx qtbase ];
 
-  preInstall = ''
-    substituteInPlace platforminputcontext/cmake_install.cmake \
-      --replace ${qtbase.bin} $out
-    substituteInPlace quickphrase-editor/cmake_install.cmake \
-      --replace ${fcitx} $out
+  preConfigure = ''
+    substituteInPlace platforminputcontext/CMakeLists.txt \
+      --replace \$"{CMAKE_INSTALL_QTPLUGINDIR}" $out/${qtbase.qtPluginPrefix}
+    substituteInPlace quickphrase-editor/CMakeLists.txt \
+      --replace \$"{FCITX4_ADDON_INSTALL_DIR}" $out/lib/fcitx
   '';
 
   meta = with lib; {
-    homepage    = https://gitlab.com/fcitx/fcitx-qt5;
+    homepage    = "https://gitlab.com/fcitx/fcitx-qt5";
     description = "Qt5 IM Module for Fcitx";
     license     = licenses.gpl2;
     platforms   = platforms.linux;

pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix

@@ -12,14 +12,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ibus-typing-booster-${version}";
-  version = "2.6.2";
+  pname = "ibus-typing-booster";
+  version = "2.6.4";
 
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
     rev = version;
-    sha256 = "0013njl539knp78iciv860fkpl15bkwarjwd2vjrmr5dbb0h15yc";
+    sha256 = "1k074y9439w8v6s71i7hhmkq9bgkl836y2a409rx3mb73vidadjr";
   };
 
   patches = [ ./hunspell-dirs.patch ];