diff options
author | Danylo Hlynskyi <abcz2.uprola@gmail.com> | 2019-08-05 14:09:28 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-05 14:09:28 +0300 |
commit | 7585496effbf7fe7815265c2211e8745a90d3136 (patch) | |
tree | 38eda227ff9b4ef2c467388a6a399d4daf929b06 /pkgs/tools/inputmethods | |
parent | d0413360d3a6c51dc56d4ce0ab07ad4678a83ada (diff) | |
parent | 4e795680bef5fb8740442451496f890c301d8592 (diff) | |
download | nixlib-7585496effbf7fe7815265c2211e8745a90d3136.tar nixlib-7585496effbf7fe7815265c2211e8745a90d3136.tar.gz nixlib-7585496effbf7fe7815265c2211e8745a90d3136.tar.bz2 nixlib-7585496effbf7fe7815265c2211e8745a90d3136.tar.lz nixlib-7585496effbf7fe7815265c2211e8745a90d3136.tar.xz nixlib-7585496effbf7fe7815265c2211e8745a90d3136.tar.zst nixlib-7585496effbf7fe7815265c2211e8745a90d3136.zip |
Merge branch 'master' into flip-map-foreach
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 | 38 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/fusuma/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/inputmethods/ibus/default.nix | 4 |
4 files changed, 23 insertions, 27 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 166fd16811ab..ad5b46694981 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,42 +1,38 @@ -{ stdenv, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules -, fetchpatch +{ lib, mkDerivation, fetchFromGitLab +, cmake +, extra-cmake-modules +, fcitx +, pkgconfig +, qtbase }: -stdenv.mkDerivation rec { - name = "fcitx-qt5-${version}"; - version = "1.2.1"; +mkDerivation rec { + pname = "fcitx-qt5"; + version = "1.2.3"; - src = fetchurl { - url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz"; - sha256 = "0z8ax0dxk88byic41mfaiahjdv1k8ciwn97xfjkkgr4ijgscdr8c"; + src = fetchFromGitLab { + owner = "fcitx"; + repo = pname; + rev = version; + sha256 = "0860v3rxsh054wkkbawvyin5mk0flp4cwfcpmcpq147lvdm5lq2i"; }; - patches = [ - # Fix build with Qt 5.11 - # https://github.com/fcitx/fcitx-qt5/issues/34 - (fetchpatch { - url = https://github.com/fcitx/fcitx-qt5/commit/af033e3d5305108eecc568adff7f8b2da5831ed6.diff; - sha256 = "14vfz1fw2k362wnqpglw766fg3d3mc8cmfgic2p96yyipjh9xx3b"; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; buildInputs = [ fcitx qtbase ]; 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; { - homepage = https://github.com/fcitx/fcitx-qt5; + meta = with lib; { + homepage = https://gitlab.com/fcitx/fcitx-qt5; description = "Qt5 IM Module for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; }; - } diff --git a/pkgs/tools/inputmethods/fusuma/default.nix b/pkgs/tools/inputmethods/fusuma/default.nix index 2630ab0fc81f..b410a21cd6ba 100644 --- a/pkgs/tools/inputmethods/fusuma/default.nix +++ b/pkgs/tools/inputmethods/fusuma/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, makeWrapper, libinput }: +{ lib, bundlerApp, bundlerUpdateScript, makeWrapper, libinput }: bundlerApp { pname = "fusuma"; @@ -12,11 +12,13 @@ bundlerApp { --prefix PATH : ${lib.makeBinPath [ libinput ]} ''; + passthru.updateScript = bundlerUpdateScript "fusuma"; + meta = with lib; { description = "Multitouch gestures with libinput driver on X11, Linux"; homepage = https://github.com/iberianpig/fusuma; license = licenses.mit; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ jfrankenau nicknovitski ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index d2090d776762..07fa8d2beb56 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,5 +1,5 @@ { stdenv, substituteAll, fetchurl, fetchFromGitHub, autoreconfHook, gettext, makeWrapper, pkgconfig -, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2 +, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk-pixbuf, gobject-introspection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePython2Library ? false , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null , buildPackages, runtimeShell }: @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus dconf - gdk_pixbuf + gdk-pixbuf gobject-introspection python3.pkgs.pygobject3 # for pygobject overrides gtk2 |