diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-02-27 06:30:04 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-02-28 07:12:55 -0600 |
| commit | 3a8a887cfd4b62e24353e29f173e0272a3ca6f3a (patch) | |
| tree | 414ed7c846fee3aa5c44630bbc5b81a6a3337082 /pkgs/tools/inputmethods/ibus | |
| parent | efad7bd47d3e2864ba2c28c2fd5ec0bd22dd9200 (diff) | |
ibus-with-plugins: replace ibus wrappers
Diffstat (limited to 'pkgs/tools/inputmethods/ibus')
| -rw-r--r-- | pkgs/tools/inputmethods/ibus/wrapper.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index 3bccad1cc0c9..72fbaef6604a 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -1,11 +1,15 @@ -{ stdenv, runCommand, ibus, lndir, makeWrapper, plugins, hicolor_icon_theme }: +{ stdenv, runCommand, makeWrapper, lndir +, dconf, hicolor_icon_theme, ibus, plugins +}: let name = "ibus-with-plugins-" + (builtins.parseDrvName ibus.name).version; env = { + buildInputs = [ ibus ] ++ plugins; nativeBuildInputs = [ lndir makeWrapper ]; propagatedUserEnvPackages = [ hicolor_icon_theme ]; paths = [ ibus ] ++ plugins; + inherit (ibus) meta; }; command = '' for dir in bin etc lib libexec share; do @@ -19,7 +23,8 @@ let for prog in ibus ibus-daemon ibus-setup; do wrapProgram "$out/bin/$prog" \ - --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ --set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_LIBEXECDIR "$out/libexec" \ @@ -29,7 +34,9 @@ let --set IBUS_TABLE_DATA_DIR "$out/share" \ --set IBUS_TABLE_LIB_LOCATION "$out/libexec" \ --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \ - --set IBUS_TABLE_DEBUG_LEVEL 1 + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" done ''; in |