summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2016-10-03 05:24:33 -0500
committerThomas Tuegel <ttuegel@gmail.com>2016-10-03 05:25:41 -0500
commit08aea872977f575c9f168d29da38938863acd928 (patch)
tree0bcfdb0721fe1a115a361ee2aa82a7cd42488bde
parent08cb89ae19f3e6f61627b27382fe08e6a9173bf8 (diff)
downloadnixlib-08aea872977f575c9f168d29da38938863acd928.tar
nixlib-08aea872977f575c9f168d29da38938863acd928.tar.gz
nixlib-08aea872977f575c9f168d29da38938863acd928.tar.bz2
nixlib-08aea872977f575c9f168d29da38938863acd928.tar.lz
nixlib-08aea872977f575c9f168d29da38938863acd928.tar.xz
nixlib-08aea872977f575c9f168d29da38938863acd928.tar.zst
nixlib-08aea872977f575c9f168d29da38938863acd928.zip
ibus: refresh cache at startup
Fixes #19134. (Maybe.)
-rw-r--r--nixos/modules/i18n/input-method/ibus.nix2
-rw-r--r--pkgs/tools/inputmethods/ibus/wrapper.nix22
2 files changed, 22 insertions, 2 deletions
diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix
index d64cf2f283bf..e23e28aa25ef 100644
--- a/nixos/modules/i18n/input-method/ibus.nix
+++ b/nixos/modules/i18n/input-method/ibus.nix
@@ -17,7 +17,7 @@ let
       [Desktop Entry]
       Name=IBus
       Type=Application
-      Exec=${ibusPackage}/bin/ibus-daemon --daemonize --xim --cache=refresh
+      Exec=${ibusPackage}/bin/ibus-daemon --daemonize --xim
     '';
   };
 in
diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix
index 74333c459e8f..f38705cc9d13 100644
--- a/pkgs/tools/inputmethods/ibus/wrapper.nix
+++ b/pkgs/tools/inputmethods/ibus/wrapper.nix
@@ -21,7 +21,7 @@ let
         done
     done
 
-    for prog in ibus ibus-daemon ibus-setup; do
+    for prog in ibus ibus-setup; do
         wrapProgram "$out/bin/$prog" \
           --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
           --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
@@ -39,6 +39,26 @@ let
           --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
           --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share"
     done
+
+    for prog in ibus-daemon; do
+        wrapProgram "$out/bin/$prog" \
+          --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
+          --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" \
+          --set IBUS_LOCALEDIR "$out/share/locale" \
+          --set IBUS_PREFIX "$out" \
+          --set IBUS_TABLE_BIN_PATH "$out/bin" \
+          --set IBUS_TABLE_DATA_DIR "$out/share" \
+          --set IBUS_TABLE_LIB_LOCATION "$out/libexec" \
+          --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \
+          --prefix PYTHONPATH : "$PYTHONPATH" \
+          --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
+          --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \
+          --add-flags "--cache=refresh"
+    done
   '';
 in
   runCommand name env command