dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ibus-with-plugins: replace ibus wrappers

Browse Source
This commit is contained in:
Thomas Tuegel 2016-02-27 06:30:04 -06:00
parent efad7bd47d
commit 3a8a887cfd
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,15 @@
{ stdenv, runCommand, ibus, lndir, makeWrapper, plugins, hicolor_icon_theme }: { stdenv, runCommand, makeWrapper, lndir
, dconf, hicolor_icon_theme, ibus, plugins
}:
let let
name = "ibus-with-plugins-" + (builtins.parseDrvName ibus.name).version; name = "ibus-with-plugins-" + (builtins.parseDrvName ibus.name).version;
env = { env = {
buildInputs = [ ibus ] ++ plugins;
nativeBuildInputs = [ lndir makeWrapper ]; nativeBuildInputs = [ lndir makeWrapper ];
propagatedUserEnvPackages = [ hicolor_icon_theme ]; propagatedUserEnvPackages = [ hicolor_icon_theme ];
paths = [ ibus ] ++ plugins; paths = [ ibus ] ++ plugins;
inherit (ibus) meta;
}; };
command = '' command = ''
for dir in bin etc lib libexec share; do for dir in bin etc lib libexec share; do
@ -19,7 +23,8 @@ 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" \
--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_COMPONENT_PATH "$out/share/ibus/component/" \
--set IBUS_DATAROOTDIR "$out/share" \ --set IBUS_DATAROOTDIR "$out/share" \
--set IBUS_LIBEXECDIR "$out/libexec" \ --set IBUS_LIBEXECDIR "$out/libexec" \
@ -29,7 +34,9 @@ let
--set IBUS_TABLE_DATA_DIR "$out/share" \ --set IBUS_TABLE_DATA_DIR "$out/share" \
--set IBUS_TABLE_LIB_LOCATION "$out/libexec" \ --set IBUS_TABLE_LIB_LOCATION "$out/libexec" \
--set IBUS_TABLE_LOCATION "$out/share/ibus-table" \ --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 done
''; '';
in in

1
pkgs/top-level/all-packages.nix
View File

@ -1198,6 +1198,7 @@ let
}; };
ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix {
inherit (gnome3) dconf;
plugins = [ ]; plugins = [ ];
}; };