public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ibus: consolidate wrappers

Browse Source
This commit is contained in:
Thomas Tuegel 2016-02-28 09:30:09 -06:00
parent 070dccae7b
commit ab746ec902
4 changed files with 17 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv, fetchFromGitHub, makeWrapper, ibus, anthy, intltool { stdenv, fetchurl, intltool, pkgconfig
, pkgconfig, glib, gobjectIntrospection , anthy, ibus, glib, gobjectIntrospection, gtk3, python3, pygobject3
, python3, pygobject3, gtk3, libtool, automake, autoconf
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,28 +15,20 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ gebner ericsagnes ]; maintainers = with maintainers; [ gebner ericsagnes ];
}; };
preConfigure = "./autogen.sh --prefix=$out";
configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t"; configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t";
buildInputs = [ buildInputs = [
makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection anthy glib gobjectIntrospection gtk3 ibus python3 pygobject3
python3 pygobject3 gtk3 libtool automake autoconf
]; ];
nativeBuildInputs = [ intltool pkgconfig ];
postFixup = '' postFixup = ''
substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out
for file in "$out"/libexec/*; do # */
wrapProgram "$file" \
--prefix PYTHONPATH : $PYTHONPATH \
--prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH:$out/lib/girepository-1.0
done
''; '';
src = fetchFromGitHub { src = fetchurl {
owner = "ibus"; url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
repo = "ibus-anthy"; sha256 = "1aj7vnfky7izl23xyjky78z3qas3q72l3kr8dnql2lnivsrb8q1y";
rev = version;
sha256 = "1laxwpnhgihv4dz5cgcz6d0a0880r93n7039ciz1m53hdzapwi4a";
}; };
} }

15
pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
View File

@ -1,5 +1,4 @@
{ stdenv, fetchurl, makeWrapper { stdenv, fetchurl, intltool, pkgconfig
, intltool, pkgconfig
, gtk3, ibus, libhangul, librsvg, python3, pygobject3 , gtk3, ibus, libhangul, librsvg, python3, pygobject3
}: }:
@ -9,20 +8,12 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz"; url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz";
sha256 = null; sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2";
}; };
buildInputs = [ gtk3 ibus libhangul python3 pygobject3 ]; buildInputs = [ gtk3 ibus libhangul python3 pygobject3 ];
nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; nativeBuildInputs = [ intltool pkgconfig ];
postInstall = ''
wrapProgram $out/bin/ibus-setup-hangul \
--prefix PYTHONPATH : $PYTHONPATH \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
--prefix LD_LIBRARY_PATH : ${libhangul}/lib
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
isIbusEngine = true; isIbusEngine = true;

27
pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, ibus, pkgconfig, python3, pygobject3 { stdenv, fetchurl, pkgconfig
, gtk3, atk, dconf, gobjectIntrospection }: , gtk3, dconf, gobjectIntrospection, ibus, python3, pygobject3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ibus-table-${version}"; name = "ibus-table-${version}";
@ -25,29 +25,10 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
gtk3 dconf gobjectIntrospection dconf gtk3 gobjectIntrospection ibus python3 pygobject3
ibus
pkgconfig
python3 pygobject3
]; ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ pkgconfig ];
preFixup = ''
for prog in "$out/bin"/*; do #*/
wrapProgram "$prog" \
--prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
done
for prog in "$out/libexec"/*; do #*/
wrapProgram "$prog" \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0"
done
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
isIbusEngine = true; isIbusEngine = true;

3
pkgs/tools/inputmethods/ibus/wrapper.nix
View File

@ -1,5 +1,5 @@
{ stdenv, runCommand, makeWrapper, lndir { stdenv, runCommand, makeWrapper, lndir
, dconf, hicolor_icon_theme, ibus, plugins , dconf, hicolor_icon_theme, ibus, librsvg, plugins
}: }:
let let
@ -23,6 +23,7 @@ let
for prog in ibus ibus-daemon ibus-setup; do for prog in ibus ibus-daemon ibus-setup; do
wrapProgram "$out/bin/$prog" \ wrapProgram "$out/bin/$prog" \
--prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
--set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \