ibus: 1.5.24 -> 1.5.26 #164105

ncfavier · 2022-03-14T12:10:01Z

https://github.com/ibus/ibus/releases/tag/1.5.25
https://github.com/ibus/ibus/releases/tag/1.5.26

Upstream added a dependency on systemd only to get the pkg-config variable systemduserunitdir, which is wrong for our purposes (we only want /lib/systemd/user without the systemd prefix) so we can drop the dependency.

Also enabled GTK 4 in hope to fix #163683 (cc @jian-lin, not sure how to test this)

Things done

ncfavier · 2022-03-14T12:29:55Z

@ofborg test installed-tests.ibus

bobby285271 · 2022-03-14T13:16:29Z

Tested ibus-libpinyin on GNOME VM on de41ff40daa68a7f59d81e40e2cfb7920e97de34, Chinese input works on gedit (gtk3) and qownnotes (qt5) but does not works on gnome-text-editor (gtk4)

I did not do things other than adding

i18n.inputMethod = {
  enabled = "ibus";
  ibus.engines = with pkgs.ibus-engines; [ libpinyin ];
};

And adding intelligent pinyin to input sources (gnome-control-center, see the first screenshot)

Maybe some nixos modules also needs update, did not test yet.

bobby285271 · 2022-03-14T13:28:35Z

Looks like there is https://gitlab.gnome.org/GNOME/gtk/-/issues/1181 so there is no gtk4-query-immodules

jtojnar · 2022-03-14T14:11:52Z

Trying env GTK_PATH=$(nix-build -A ibus)/lib/gtk-4.0 $(nix-build -A gnome-text-editor)/bin/gnome-text-editor in this branch works for me (with Japanase (mozc) & ctrl-shift-e in Czech). And it does not work without the GTK_PATH. The only difference I noticed comparing it with gedit (GTK 3) is that the emoji character chooser is placed onto a wrong screen with GTK 4.

So it should be as simple as adding the ibus package to systemPackages, ensuring lib/gtk-4.0 is in pathsToLink, and adding that to

nixpkgs/nixos/modules/programs/environment.nix

Line 43 in aee602a

GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];

.

ncfavier · 2022-03-14T14:21:59Z

Done, not sure where the pathsToLink should go

jtojnar · 2022-03-14T14:25:09Z

I would put it to nixos/modules/programs/environment.nix as well.

Currently we are also getting it from

nixpkgs/nixos/modules/config/system-path.nix

Line 152 in aee602a

"/lib" # FIXME: remove and update debug-info.nix

but that will ideally change.

ncfavier · 2022-03-14T14:28:22Z

OK, I also added /lib/gtk-{2,3}.0 since they're also in GTK_PATH.

jtojnar · 2022-03-14T14:30:18Z

pkgs/tools/inputmethods/ibus/fix-paths.patch

+-        systemd >= 0.7.5
+-    ])
+-    AC_SUBST([SYSTEMD_USER_UNIT_DIR], [`$PKG_CONFIG --variable systemduserunitdir systemd`])
+    AC_SUBST([SYSTEMD_USER_UNIT_DIR], [/lib/systemd/user])


Why not just use ${prefix}/lib/systemd/user here, instead all the hoops above? (Thinking ${} is the correct interpolation scheme in here, but not completely sure, maybe also try $(), and either of those with doubled $.)

Also there is an alternative of keeping systemd and overriding the path using environment variable:

nixpkgs/pkgs/tools/misc/colord/default.nix

Line 97 in 5838071

PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";

D'oh. Lost myself in the autohoops.

Which way do we prefer?

Either way is fine, though if we keep it in a patch, it should probably go to a separate patch file. fix-paths.patch is usually refers to runtime paths in the code, rather than installation paths (yeah, the name is not good).

Meh, that sounds like an artificial difference? I think "patching paths due to Nix quirks (or non-Nix quirks)" is a reasonable category

I would not say the difference is artificial, though it is hard to articulate. In this case, I would even consider it an upstream bug, see https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/. Maybe passing --define-variable 'prefix=${prefix}' to the pkg-config call would be an upstreamable fix.

Oh, I was trying to do something like that earlier, missed --define-variable. Yeah that sounds reasonable

Opened ibus/ibus#2388

See https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/ and the discussion at NixOS/nixpkgs#164105 (comment)

pkgs/tools/inputmethods/ibus/fix-paths.patch

pkgs/tools/inputmethods/ibus/default.nix

https://github.com/ibus/ibus/releases/tag/1.5.25 https://github.com/ibus/ibus/releases/tag/1.5.26 Also enabled GTK 4 in hope to fix NixOS#163683

jtojnar

Did not test but looks good to me.

bobby285271 · 2022-03-15T04:17:55Z

Tested again on aaad72a using VM, ibus (ibus-libpinyin) works on gnome-text-editor (gtk4), notejot (gtk4), pantheon.elemenaty-code (gtk3), libsForQt5.kate (qt5) on GNOME & GNOME on Xorg & XFCE. Tested the same thing with fcitx5 (fcitx5-chinese-addons).

When testing ibus-libpinyin on GTK4 apps, the candidate window position does not seem right for me, but I don't see similar issue on fcitx5 (fcitx5-chinese-addons) so maybe this is a ibus specific issue (not sure).

bobby285271

test result LGTM, nixpkgs-review happy on x86_64-linux

Result of nixpkgs-review pr 164105 run on x86_64-linux 1

4 packages marked as broken and skipped:

libsForQt512.kdeplasma-addons
libsForQt512.plasma-desktop
libsForQt514.kdeplasma-addons
libsForQt514.plasma-desktop

3 packages blacklisted:

nixos-install-tools
tests.nixos-functions.nixos-test
tests.nixos-functions.nixosTest-test

54 packages built:

adapta-gtk-theme
chrome-gnome-shell
enlightenment.econnman
enlightenment.ecrire
enlightenment.efl
enlightenment.enlightenment
enlightenment.ephoto
enlightenment.evisum
enlightenment.rage
enlightenment.terminology
gnome.gnome-control-center
gnome.gnome-flashback
gnome.gnome-session
gnome.gnome-shell
gnome.gnome-terminal
gnome.gnome-tweaks
gnomeExtensions.easyScreenCast
gnomeExtensions.gsconnect
gnomeExtensions.night-theme-switcher
haskellPackages.gi-ibus
ibus
ibus-engines.anthy
ibus-engines.hangul
ibus-engines.kkc
ibus-engines.libpinyin
ibus-engines.libthai
ibus-engines.m17n
ibus-engines.mozc
ibus-engines.rime
ibus-engines.table
ibus-engines.table-chinese
ibus-engines.table-others
ibus-engines.typing-booster
ibus-engines.typing-booster-unwrapped
ibus-engines.uniemoji
ibus-qt
ibus-with-plugins
libsForQt5.kdeplasma-addons (libsForQt515.kdeplasma-addons ,plasma5Packages.kdeplasma-addons)
libsForQt5.plasma-desktop (libsForQt515.plasma-desktop ,plasma5Packages.plasma-desktop)
mlterm
pantheon.elementary-greeter
pantheon.elementary-session-settings
pantheon.switchboard-plug-keyboard
pantheon.switchboard-with-plugs
pantheon.wingpanel-applications-menu
pantheon.wingpanel-indicator-keyboard
pantheon.wingpanel-with-indicators
phosh
python310Packages.pythonefl
python39Packages.pythonefl
snippetpixie
tests.trivial-builders.references
vimix-gtk-themes
whitesur-gtk-theme

jian-lin · 2022-03-15T07:21:12Z

tested this patch based on 062a0c5 on gnome-text-editor(gtk4).

I can input Chinese using ibus-rime, but the candidate window is invisible. On gedit(gtk3), it works well.

FWIW, my environment is gnome on x11 with nvidia card.

ncfavier · 2022-03-15T20:10:23Z

Should we merge this and investigate the GTK 4 issues separately? I think the changes in this PR at least make sense, but more work may be needed.

See https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/ and the discussion at NixOS/nixpkgs#164105 (comment)

BUG=#2388 BUG=NixOS/nixpkgs#164105 (comment)

ncfavier requested review from jtojnar and Artturin March 14, 2022 12:10

ofborg bot requested review from ttuegel and lukateras March 14, 2022 12:23

ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 labels Mar 14, 2022

jtojnar added this to In progress in GNOME 42 via automation Mar 14, 2022

github-actions bot added 6.topic: nixos 8.has: module (update) labels Mar 14, 2022

ncfavier force-pushed the ibus branch from 05af889 to e119a83 Compare March 14, 2022 14:27

ncfavier force-pushed the ibus branch from e119a83 to ca176d9 Compare March 14, 2022 14:29

jtojnar reviewed Mar 14, 2022

View reviewed changes

ncfavier force-pushed the ibus branch from ca176d9 to 59ece9d Compare March 14, 2022 14:56

ncfavier added a commit to ncfavier/ibus that referenced this pull request Mar 14, 2022

Use our own prefix to look up systemd user services dir

33b4b39

See https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/ and the discussion at NixOS/nixpkgs#164105 (comment)

ncfavier mentioned this pull request Mar 14, 2022

Use our own prefix to look up systemd user services dir ibus/ibus#2388

Closed

ncfavier force-pushed the ibus branch from 59ece9d to ee9c4a3 Compare March 14, 2022 15:29

jtojnar reviewed Mar 14, 2022

View reviewed changes

pkgs/tools/inputmethods/ibus/fix-paths.patch Show resolved Hide resolved

ncfavier force-pushed the ibus branch from ee9c4a3 to 372bfa0 Compare March 14, 2022 15:54

jtojnar reviewed Mar 14, 2022

View reviewed changes

pkgs/tools/inputmethods/ibus/default.nix Outdated Show resolved Hide resolved

ncfavier force-pushed the ibus branch from 372bfa0 to a03e8e0 Compare March 14, 2022 16:53

ncfavier added 2 commits March 14, 2022 18:00

ibus: 1.5.24 -> 1.5.26

44564fc

https://github.com/ibus/ibus/releases/tag/1.5.25 https://github.com/ibus/ibus/releases/tag/1.5.26 Also enabled GTK 4 in hope to fix NixOS#163683

nixos/environment: add GTK paths to pathsToLink

aaad72a

ncfavier force-pushed the ibus branch from a03e8e0 to aaad72a Compare March 14, 2022 17:01

jtojnar approved these changes Mar 14, 2022

View reviewed changes

bobby285271 approved these changes Mar 15, 2022

View reviewed changes

jtojnar merged commit 0f94c5b into NixOS:master Mar 15, 2022

GNOME 42 automation moved this from In progress to Done Mar 15, 2022

ncfavier deleted the ibus branch March 15, 2022 20:25

ncfavier added a commit to ncfavier/ibus that referenced this pull request May 31, 2022

configure: Use our own prefix to look up systemd user services dir

4c03d71

See https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/ and the discussion at NixOS/nixpkgs#164105 (comment)

fujiwarat pushed a commit to ibus/ibus that referenced this pull request Jun 3, 2022

configure: Use our own prefix to look up systemd user services dir

9f62a40

BUG=#2388 BUG=NixOS/nixpkgs#164105 (comment)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ibus: 1.5.24 -> 1.5.26 #164105

ibus: 1.5.24 -> 1.5.26 #164105

ncfavier commented Mar 14, 2022 •

edited

Loading

ncfavier commented Mar 14, 2022

bobby285271 commented Mar 14, 2022

bobby285271 commented Mar 14, 2022 •

edited

Loading

jtojnar commented Mar 14, 2022

ncfavier commented Mar 14, 2022

jtojnar commented Mar 14, 2022

ncfavier commented Mar 14, 2022

jtojnar Mar 14, 2022 •

edited

Loading

jtojnar Mar 14, 2022

ncfavier Mar 14, 2022

jtojnar Mar 14, 2022

ncfavier Mar 14, 2022

jtojnar Mar 14, 2022 •

edited

Loading

ncfavier Mar 14, 2022

ncfavier Mar 14, 2022

jtojnar left a comment

bobby285271 commented Mar 15, 2022 •

edited

Loading

bobby285271 left a comment •

edited

Loading

jian-lin commented Mar 15, 2022 •

edited

Loading

ncfavier commented Mar 15, 2022

ibus: 1.5.24 -> 1.5.26 #164105

ibus: 1.5.24 -> 1.5.26 #164105

Conversation

ncfavier commented Mar 14, 2022 • edited Loading

Things done

ncfavier commented Mar 14, 2022

bobby285271 commented Mar 14, 2022

bobby285271 commented Mar 14, 2022 • edited Loading

jtojnar commented Mar 14, 2022

ncfavier commented Mar 14, 2022

jtojnar commented Mar 14, 2022

ncfavier commented Mar 14, 2022

jtojnar Mar 14, 2022 • edited Loading

Choose a reason for hiding this comment

jtojnar Mar 14, 2022

Choose a reason for hiding this comment

ncfavier Mar 14, 2022

Choose a reason for hiding this comment

jtojnar Mar 14, 2022

Choose a reason for hiding this comment

ncfavier Mar 14, 2022

Choose a reason for hiding this comment

jtojnar Mar 14, 2022 • edited Loading

Choose a reason for hiding this comment

ncfavier Mar 14, 2022

Choose a reason for hiding this comment

ncfavier Mar 14, 2022

Choose a reason for hiding this comment

jtojnar left a comment

Choose a reason for hiding this comment

bobby285271 commented Mar 15, 2022 • edited Loading

bobby285271 left a comment • edited Loading

Choose a reason for hiding this comment

jian-lin commented Mar 15, 2022 • edited Loading

ncfavier commented Mar 15, 2022

ncfavier commented Mar 14, 2022 •

edited

Loading

bobby285271 commented Mar 14, 2022 •

edited

Loading

jtojnar Mar 14, 2022 •

edited

Loading

jtojnar Mar 14, 2022 •

edited

Loading

bobby285271 commented Mar 15, 2022 •

edited

Loading

bobby285271 left a comment •

edited

Loading

jian-lin commented Mar 15, 2022 •

edited

Loading