diff options
| author | danbst <abcz2.uprola@gmail.com> | 2019-08-18 18:00:25 +0300 |
|---|---|---|
| committer | danbst <abcz2.uprola@gmail.com> | 2019-08-18 18:00:25 +0300 |
| commit | d80cd26ff981f1c4be96b82757811b21f280f1a6 (patch) | |
| tree | 28375ed14a49fe86c03ef21868833faa23b56215 /pkgs/tools/inputmethods | |
| parent | 29ba0a0adff274f5ea0d93246be3f2957d234a7b (diff) | |
| parent | 2ca09a94be5182c8f8cc688eaded558d827312f1 (diff) | |
Merge branch 'master' into flip-map-foreach
Diffstat (limited to 'pkgs/tools/inputmethods')
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 12 | ||||
| -rw-r--r-- | pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index ad5b46694981..3fd1efcc3434 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/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; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 2b2cc1a34992..2ee6944eeb3b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/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 ]; |