diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
| commit | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (patch) | |
| tree | adbc42e629ea3441456eb5e5e4e0b3a7fa2d867a /pkgs/tools/inputmethods | |
| parent | f498a8b7af41401c167baa6879a8b0271e8ffbf5 (diff) | |
| parent | ff13b6f1acceac062e66a2b0f39a59bcb5570a87 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/inputmethods')
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 4468f1fa263a..5b55e0f04785 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -25,8 +25,6 @@ stdenv.mkDerivation rec { preInstall = '' substituteInPlace src/cmake_install.cmake \ --replace ${fcitx} $out - substituteInPlace po/cmake_install.cmake \ - --replace ${fcitx} $out substituteInPlace data/cmake_install.cmake \ --replace ${fcitx} $out substituteInPlace dictmanager/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index b371edb1acee..ad5b46694981 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,6 +1,12 @@ -{ stdenv, fetchFromGitLab, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }: +{ lib, mkDerivation, fetchFromGitLab +, cmake +, extra-cmake-modules +, fcitx +, pkgconfig +, qtbase +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "fcitx-qt5"; version = "1.2.3"; @@ -17,12 +23,12 @@ stdenv.mkDerivation rec { preInstall = '' substituteInPlace platforminputcontext/cmake_install.cmake \ - --replace ${qtbase.out} $out + --replace ${qtbase.bin} $out substituteInPlace quickphrase-editor/cmake_install.cmake \ --replace ${fcitx} $out ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://gitlab.com/fcitx/fcitx-qt5; description = "Qt5 IM Module for Fcitx"; license = licenses.gpl2; |