diff options
Diffstat (limited to 'pkgs/tools/inputmethods/ibus-engines')
7 files changed, 177 insertions, 75 deletions
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index d2f68fd5269..cfdfa85ad9f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -1,35 +1,57 @@ -{ stdenv, fetchurl, intltool, pkgconfig -, anthy, ibus, glib, gobject-introspection, gtk3, python3 +{ stdenv +, fetchurl +, gettext +, pkgconfig +, wrapGAppsHook +, anthy +, ibus +, glib +, gobject-introspection +, gtk3 +, python3 }: stdenv.mkDerivation rec { pname = "ibus-anthy"; version = "1.5.11"; - meta = with stdenv.lib; { - isIbusEngine = true; - description = "IBus interface to the anthy input method"; - homepage = https://github.com/fujiwarat/ibus-anthy; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ gebner ericsagnes ]; + src = fetchurl { + url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz"; + sha256 = "1zwgswpibh67sgbza8kvg03v06maxc08ihkgm5hmh333sjq9d5c0"; }; - configureFlags = [ "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t" ]; - buildInputs = [ - anthy glib gobject-introspection gtk3 ibus (python3.withPackages (ps: [ps.pygobject3])) + anthy + glib + gtk3 + ibus + (python3.withPackages (ps: [ + ps.pygobject3 + (ps.toPythonModule ibus) + ])) + ]; + + nativeBuildInputs = [ + gettext + gobject-introspection + pkgconfig + wrapGAppsHook ]; - nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ]; + configureFlags = [ + "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t" + ]; postFixup = '' - wrapPythonPrograms substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out ''; - src = fetchurl { - url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1zwgswpibh67sgbza8kvg03v06maxc08ihkgm5hmh333sjq9d5c0"; + meta = with stdenv.lib; { + isIbusEngine = true; + description = "IBus interface to the anthy input method"; + homepage = https://github.com/fujiwarat/ibus-anthy; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ gebner ericsagnes ]; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index 0a38ccfa3bd..d5e2f50299e 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -1,7 +1,8 @@ { stdenv , fetchurl , substituteAll -, intltool +, appstream-glib +, gettext , pkgconfig , wrapGAppsHook , gtk3 @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { pname = "ibus-hangul"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0gha8dfdf54rx8fv3yfikbgdg6lqq6l883lhg7q68ybvkjx9bwbs"; + sha256 = "1400ba2p34vr9q285lqvjm73f6m677cgfdymmjpiwyrjgbbiqrjy"; }; patches = [ @@ -27,9 +28,9 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - intltool + appstream-glib + gettext pkgconfig - python3.pkgs.wrapPython wrapGAppsHook ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index fc4677e06b0..2c1d558f04d 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -1,33 +1,54 @@ -{ stdenv, fetchFromGitHub, autoreconfHook -, intltool, pkgconfig, sqlite, libpinyin, db -, ibus, glib, gtk3, python3 +{ stdenv +, fetchFromGitHub +, autoreconfHook +, gettext +, pkgconfig +, wrapGAppsHook +, sqlite +, libpinyin +, db +, ibus +, glib +, gtk3 +, python3 }: stdenv.mkDerivation rec { pname = "ibus-libpinyin"; - version = "1.10.0"; + version = "1.11.1"; src = fetchFromGitHub { - owner = "libpinyin"; - repo = "ibus-libpinyin"; - rev = version; - sha256 = "0zkzz6ig74nws8phqxbsggnpf5g5f2hxi0mdyn2m3s4nm14q3ma6"; + owner = "libpinyin"; + repo = "ibus-libpinyin"; + rev = version; + sha256 = "0b8rilk9zil9gvfhlk3rphcby6ph11dw66j175wp0na6h6hjlaf2"; }; - buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ]; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig python3.pkgs.wrapPython ]; + nativeBuildInputs = [ + autoreconfHook + gettext + pkgconfig + wrapGAppsHook + ]; - postAutoreconf = '' - intltoolize - ''; - - postFixup = "wrapPythonPrograms"; + buildInputs = [ + ibus + glib + sqlite + libpinyin + (python3.withPackages (pypkgs: with pypkgs; [ + pygobject3 + (toPythonModule ibus) + ])) + gtk3 + db + ]; meta = with stdenv.lib; { isIbusEngine = true; - description = "IBus interface to the libpinyin input method"; - license = licenses.gpl2; - maintainers = with maintainers; [ ericsagnes ]; - platforms = platforms.linux; + description = "IBus interface to the libpinyin input method"; + license = licenses.gpl2; + maintainers = with maintainers; [ ericsagnes ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 01b227f6f1b..c026a9d1a81 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -1,6 +1,14 @@ -{ stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig -, ibus, m17n_lib, m17n_db, gettext, python3 +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, ibus +, gtk3 +, m17n_lib +, m17n_db +, gettext +, python3 +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -8,27 +16,40 @@ stdenv.mkDerivation rec { version = "1.4.1"; src = fetchFromGitHub { - owner = "ibus"; - repo = "ibus-m17n"; - rev = version; + owner = "ibus"; + repo = "ibus-m17n"; + rev = version; sha256 = "1xl7swqn46nhi43rka0zx666mpk667ykag3sz07x0zqrwi41frps"; }; - buildInputs = [ - ibus m17n_lib m17n_db gettext - python3 + nativeBuildInputs = [ + autoreconfHook + gettext + pkgconfig + wrapGAppsHook ]; - nativeBuildInputs = [ autoreconfHook pkgconfig python3.pkgs.wrapPython ]; + buildInputs = [ + ibus + gtk3 + m17n_lib + m17n_db + (python3.withPackages (ps: [ + ps.pygobject3 + (ps.toPythonModule ibus) + ])) + ]; - postFixup = "wrapPythonPrograms"; + configureFlags = [ + "--with-gtk=3.0" + ]; meta = with stdenv.lib; { isIbusEngine = true; - description = "m17n engine for ibus"; - homepage = https://github.com/ibus/ibus-m17n; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ ericsagnes ]; + description = "m17n engine for ibus"; + homepage = https://github.com/ibus/ibus-m17n; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ ericsagnes ]; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 8e34cb860a6..c95a9c1651c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { buildInputs = [ dconf gtk3 - gobject-introspection ibus (python3.withPackages (pypkgs: with pypkgs; [ pygobject3 @@ -44,7 +43,7 @@ stdenv.mkDerivation rec { autoreconfHook docbook2x pkgconfig - python3.pkgs.wrapPython + gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/allow-wrapping.patch b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/allow-wrapping.patch new file mode 100644 index 00000000000..434c85d3dbe --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/allow-wrapping.patch @@ -0,0 +1,13 @@ +diff --git a/uniemoji.xml.in b/uniemoji.xml.in +index 5fbfd0f..6fb8ad3 100644 +--- a/uniemoji.xml.in ++++ b/uniemoji.xml.in +@@ -7,7 +7,7 @@ + <license>GPL</license> + <author>Lalo Martins <lalo.martins@gmail.com></author> + <homepage>https://github.com/salty-horse/ibus-uniemoji</homepage> +- <exec>@PYTHON@ @DATADIR@/ibus-uniemoji/uniemoji.py --ibus</exec> ++ <exec>@DATADIR@/ibus-uniemoji/uniemoji.py --ibus</exec> + <textdomain>uniemoji</textdomain> + <engines> + <engine> diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index 107c8c60271..435d1154d4a 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -1,8 +1,19 @@ -{ stdenv, fetchFromGitHub -, python3Packages +{ stdenv +, fetchFromGitHub +, gobject-introspection +, wrapGAppsHook +, python3 +, ibus }: -stdenv.mkDerivation rec { +let + python = python3.withPackages (ps: with ps; [ + pygobject3 + (toPythonModule ibus) + pyxdg + python-Levenshtein + ]); +in stdenv.mkDerivation rec { pname = "ibus-uniemoji"; version = "0.6.0"; @@ -13,25 +24,39 @@ stdenv.mkDerivation rec { sha256 = "121zh3q0li1k537fcvbd4ns4jgl9bbb9gm9ihy8cfxgirv38lcfa"; }; - propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein pygobject3 ]; + patches = [ + # Do not run wrapper script with Python, + # the wrapped script will have Python in shebang anyway. + ./allow-wrapping.patch + ]; - nativeBuildInputs = [ python3Packages.wrapPython ]; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + ]; + + buildInputs = [ + python + ibus + ]; + + makeFlags = [ + "PREFIX=${placeholder ''out''}" + "SYSCONFDIR=${placeholder ''out''}/etc" + "PYTHON=${python.interpreter}" + ]; postFixup = '' - buildPythonPath $out - patchPythonScript $out/share/ibus-uniemoji/uniemoji.py + wrapGApp $out/share/ibus-uniemoji/uniemoji.py ''; - makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc" - "PYTHON=${python3Packages.python.interpreter}" - ]; - meta = with stdenv.lib; { isIbusEngine = true; - description = "Input method (ibus) for entering unicode symbols and emoji by name"; - homepage = "https://github.com/salty-horse/ibus-uniemoji"; - license = with licenses; [ gpl3 mit ]; - platforms = platforms.linux; - maintainers = with maintainers; [ aske ]; + description = "Input method (ibus) for entering unicode symbols and emoji by name"; + homepage = "https://github.com/salty-horse/ibus-uniemoji"; + license = with licenses; [ gpl3 mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ aske ]; }; } |