ibus: consolidate wrappers

+17 -53
+8 -17
pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
··· 1 - { stdenv, fetchFromGitHub, makeWrapper, ibus, anthy, intltool 2 - , pkgconfig, glib, gobjectIntrospection 3 - , python3, pygobject3, gtk3, libtool, automake, autoconf 1 + { stdenv, fetchurl, intltool, pkgconfig 2 + , anthy, ibus, glib, gobjectIntrospection, gtk3, python3, pygobject3 4 3 }: 5 4 6 5 stdenv.mkDerivation rec { ··· 16 15 maintainers = with maintainers; [ gebner ericsagnes ]; 17 16 }; 18 17 19 - preConfigure = "./autogen.sh --prefix=$out"; 20 - 21 18 configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t"; 22 19 23 20 buildInputs = [ 24 - makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection 25 - python3 pygobject3 gtk3 libtool automake autoconf 21 + anthy glib gobjectIntrospection gtk3 ibus python3 pygobject3 26 22 ]; 27 23 24 + nativeBuildInputs = [ intltool pkgconfig ]; 25 + 28 26 postFixup = '' 29 27 substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out 30 - for file in "$out"/libexec/*; do # */ 31 - wrapProgram "$file" \ 32 - --prefix PYTHONPATH : $PYTHONPATH \ 33 - --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH:$out/lib/girepository-1.0 34 - done 35 28 ''; 36 29 37 - src = fetchFromGitHub { 38 - owner = "ibus"; 39 - repo = "ibus-anthy"; 40 - rev = version; 41 - sha256 = "1laxwpnhgihv4dz5cgcz6d0a0880r93n7039ciz1m53hdzapwi4a"; 30 + src = fetchurl { 31 + url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; 32 + sha256 = "1aj7vnfky7izl23xyjky78z3qas3q72l3kr8dnql2lnivsrb8q1y"; 42 33 }; 43 34 }
+3 -12
pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
··· 1 - { stdenv, fetchurl, makeWrapper 2 - , intltool, pkgconfig 1 + { stdenv, fetchurl, intltool, pkgconfig 3 2 , gtk3, ibus, libhangul, librsvg, python3, pygobject3 4 3 }: 5 4 ··· 9 8 10 9 src = fetchurl { 11 10 url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz"; 12 - sha256 = null; 11 + sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2"; 13 12 }; 14 13 15 14 buildInputs = [ gtk3 ibus libhangul python3 pygobject3 ]; 16 15 17 - nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; 18 - 19 - postInstall = '' 20 - wrapProgram $out/bin/ibus-setup-hangul \ 21 - --prefix PYTHONPATH : $PYTHONPATH \ 22 - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ 23 - --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ 24 - --prefix LD_LIBRARY_PATH : ${libhangul}/lib 25 - ''; 16 + nativeBuildInputs = [ intltool pkgconfig ]; 26 17 27 18 meta = with stdenv.lib; { 28 19 isIbusEngine = true;
+4 -23
pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
··· 1 - { stdenv, fetchurl, makeWrapper, ibus, pkgconfig, python3, pygobject3 2 - , gtk3, atk, dconf, gobjectIntrospection }: 1 + { stdenv, fetchurl, pkgconfig 2 + , gtk3, dconf, gobjectIntrospection, ibus, python3, pygobject3 }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "ibus-table-${version}"; ··· 25 25 ''; 26 26 27 27 buildInputs = [ 28 - gtk3 dconf gobjectIntrospection 29 - ibus 30 - pkgconfig 31 - python3 pygobject3 28 + dconf gtk3 gobjectIntrospection ibus python3 pygobject3 32 29 ]; 33 30 34 - nativeBuildInputs = [ makeWrapper ]; 35 - 36 - preFixup = '' 37 - for prog in "$out/bin"/*; do #*/ 38 - wrapProgram "$prog" \ 39 - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ 40 - --prefix PYTHONPATH : "$PYTHONPATH" \ 41 - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ 42 - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" 43 - done 44 - 45 - for prog in "$out/libexec"/*; do #*/ 46 - wrapProgram "$prog" \ 47 - --prefix PYTHONPATH : "$PYTHONPATH" \ 48 - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" 49 - done 50 - ''; 31 + nativeBuildInputs = [ pkgconfig ]; 51 32 52 33 meta = with stdenv.lib; { 53 34 isIbusEngine = true;
+2 -1
pkgs/tools/inputmethods/ibus/wrapper.nix
··· 1 1 { stdenv, runCommand, makeWrapper, lndir 2 - , dconf, hicolor_icon_theme, ibus, plugins 2 + , dconf, hicolor_icon_theme, ibus, librsvg, plugins 3 3 }: 4 4 5 5 let ··· 23 23 24 24 for prog in ibus ibus-daemon ibus-setup; do 25 25 wrapProgram "$out/bin/$prog" \ 26 + --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ 26 27 --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ 27 28 --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ 28 29 --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \