Merge pull request #1703 from PkmX/pr-ibus

Fix ibus-setup
This commit is contained in:
Domen Kožar 2014-02-08 08:38:18 +01:00
commit b0f6170468

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, python, intltool, pkgconfig
, gnome3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }:
, gnome3, atk, pygobject3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }:
stdenv.mkDerivation rec {
name = "ibus-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2";
};
configureFlags = "--enable-dconf --disable-memconf --enable-ui --enable-python-library";
configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library";
buildInputs = [
makeWrapper python gnome3.glib wayland
@ -21,9 +21,13 @@ stdenv.mkDerivation rec {
preBuild = "patchShebangs ./scripts";
postInstall = ''
postInstall = ''
for f in "$out"/bin/*; do
wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share"
wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share" \
--prefix PYTHONPATH : "$(toPythonPath ${pygobject3})" \
--prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib:${atk}/lib:$out/lib" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
done
'';