From 498c0687991417672199becaa34502cc4c6b406e Mon Sep 17 00:00:00 2001 From: PkmX Date: Sat, 8 Feb 2014 05:44:44 +0800 Subject: [PATCH 1/2] Add pygobject3 to PYTHONPATH and add relevant paths to LD_LIBRRY_PATH and GI_TYPELIB_PATH to fix the perference GUI (ibus-setup). --- pkgs/development/libraries/ibus/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix index 6c82ad839e13..16f7db941b67 100644 --- a/pkgs/development/libraries/ibus/default.nix +++ b/pkgs/development/libraries/ibus/default.nix @@ -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}"; @@ -21,9 +21,12 @@ 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" done ''; From f7e47552bfc04e9e39b4746d220429fecd17c1ed Mon Sep 17 00:00:00 2001 From: PkmX Date: Sat, 8 Feb 2014 07:38:04 +0800 Subject: [PATCH 2/2] Add dconf to GIO_EXTRA_MODULES so ibus-setup doesn't use the memory backend. --- pkgs/development/libraries/ibus/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix index 16f7db941b67..75eb1b4134c0 100644 --- a/pkgs/development/libraries/ibus/default.nix +++ b/pkgs/development/libraries/ibus/default.nix @@ -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 @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { 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 GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" done '';