diff options
| author | Domen Kožar <domen@dev.si> | 2014-02-08 08:38:18 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-02-08 08:38:18 +0100 |
| commit | b0f617046817785ec0235963b335d24bf73fd317 (patch) | |
| tree | 50156a6b595dfc72a43f200a7a98d529bcf76a13 /pkgs | |
| parent | c4dbb0a961fe236229811250a8c20e0b44a15f4d (diff) | |
| parent | f7e47552bfc04e9e39b4746d220429fecd17c1ed (diff) | |
| download | nixlib-b0f617046817785ec0235963b335d24bf73fd317.tar nixlib-b0f617046817785ec0235963b335d24bf73fd317.tar.gz nixlib-b0f617046817785ec0235963b335d24bf73fd317.tar.bz2 nixlib-b0f617046817785ec0235963b335d24bf73fd317.tar.lz nixlib-b0f617046817785ec0235963b335d24bf73fd317.tar.xz nixlib-b0f617046817785ec0235963b335d24bf73fd317.tar.zst nixlib-b0f617046817785ec0235963b335d24bf73fd317.zip | |
Merge pull request #1703 from PkmX/pr-ibus
Fix ibus-setup
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/ibus/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix index 6c82ad839e13..75eb1b4134c0 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}"; @@ -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 ''; |