diff options
author | Luca Bruno <lethalman88@gmail.com> | 2015-11-29 16:50:26 +0100 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2015-11-29 16:50:26 +0100 |
commit | 920b1d3591431837f4522ccff52fb65b241200cf (patch) | |
tree | a63a1acebbee20444f4b3e9e2695ec712ba7aae3 /pkgs/tools/inputmethods | |
parent | 07a0204282224891492e7e1cfe72830a1fc32355 (diff) | |
parent | a9056371a0a62da46ff88183a6535635ed085dec (diff) | |
download | nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.gz nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.bz2 nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.lz nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.xz nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.zst nixlib-920b1d3591431837f4522ccff52fb65b241200cf.zip |
Merge branch 'master' into closure-size
Diffstat (limited to 'pkgs/tools/inputmethods')
-rw-r--r-- | pkgs/tools/inputmethods/fcitx/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 27 |
2 files changed, 32 insertions, 5 deletions
diff --git a/pkgs/tools/inputmethods/fcitx/default.nix b/pkgs/tools/inputmethods/fcitx/default.nix index a8b3089c58ac..8cdcabf3693a 100644 --- a/pkgs/tools/inputmethods/fcitx/default.nix +++ b/pkgs/tools/inputmethods/fcitx/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext , libxml2, enchant, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp -, dbus, gtk2, gtk3, qt4 +, dbus, gtk2, gtk3, qt4, kde5 }: stdenv.mkDerivation rec { name = "fcitx-${version}"; - version = "4.2.8.5"; + version = "4.2.9"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz"; - sha256 = "0whv7mnzig4l5v518r200psa1fp3dyl1jkr5z0q13ijzh1bnyggy"; + sha256 = "0v7wdf3qf74vz8q090w8k574wvfcpj9ksfcfdw93nmzyk1q5p4rs"; }; patchPhase = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ cmake enchant pango gettext libxml2 isocodes pkgconfig libxkbfile intltool cairo icu libpthreadstubs libXau libXdmcp - dbus gtk2 gtk3 qt4 + dbus gtk2 gtk3 qt4 kde5.extra-cmake-modules ]; cmakeFlags = '' @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "A Flexible Input Method Framework"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [iyzsong]; + maintainers = with stdenv.lib.maintainers; [iyzsong ericsagnes]; }; } diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix new file mode 100644 index 000000000000..fad7862cf3b9 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cmake, fcitx, extra-cmake-modules, qtbase }: + +stdenv.mkDerivation rec { + name = "fcitx-qt5-${version}"; + version = "1.0.4"; + + src = fetchurl { + url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz"; + sha256 = "070dlmwkim7sg0xwxfcbb46li1jk8yd3rmj0j5fkmgyr12044aml"; + }; + + buildInputs = [ cmake fcitx extra-cmake-modules qtbase ]; + + preInstall = '' + substituteInPlace platforminputcontext/cmake_install.cmake \ + --replace ${qtbase} $out + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/fcitx/fcitx-qt5"; + description = "Qt5 IM Module for Fcitx"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ ericsagnes ]; + }; + +} |