New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ibus: 1.5.16 -> 1.5.17, fix #31094
ibus: 1.5.16 -> 1.5.17, fix #31094
Conversation
21840a3
to
81b1b40
Compare
This seems to cause an evaluation error for me |
@grahamc Strange, it didn't for me. Perhaps I've rebased incorrectly, hold on... |
|
Oh... I should start testing packages via |
aabb21c
to
a63ce6a
Compare
Thanks @yegortimoshenko! For reference, there are some other tweaks that we might ultimately need, as described in my comments here: #30265 |
I'm getting this error:
This should fix that: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7383df20c0e..4ddc23072a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1474,7 +1474,7 @@ with pkgs;
skktools = callPackage ../tools/inputmethods/skk/skktools { };
ibus = callPackage ../tools/inputmethods/ibus {
- inherit (gnome3) dconf glib;
+ inherit (gnome3) gconf dconf glib;
};
ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; |
Definitely, this isn't completely up to date. Also, set |
Now I'm getting this error:
|
See above :-) |
Real life race conditions :) |
a63ce6a
to
f223188
Compare
This fixes the python lib, and everything builds now: diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index ba348229093..520d2934114 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -77,6 +77,9 @@ stdenv.mkDerivation rec {
substituteInPlace data/dconf/Makefile.am --replace "dconf update" true
echo \#!/bin/sh > data/dconf/make-dconf-override-db.sh
cp ${gtk_doc}/share/gtk-doc/data/gtk-doc.make .
+ substituteInPlace configure.ac \
+ --replace 'pkgpython2dir="$python2dir/ibus"' \
+ 'pkgpython2dir="'$out'/${python3.sitePackages}/ibus"'
'';
preAutoreconf = "touch ChangeLog"; |
Thanks :-) That's one way to fix it, another one that probably doesn't require patching Autoconf script is by redefining |
f223188
to
30b4299
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Success for system: aarch64-linux
no configure script, doing nothing
building
no Makefile, doing nothing
installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/fr3xmhr4mdh0xv5qwr8shq00133h422f-python3.6-bootstrapped-pip-9.0.1
stripping (with flags -S) in /nix/store/fr3xmhr4mdh0xv5qwr8shq00133h422f-python3.6-bootstrapped-pip-9.0.1/lib /nix/store/fr3xmhr4mdh0xv5qwr8shq00133h422f-python3.6-bootstrapped-pip-9.0.1/bin
patching script interpreter paths in /nix/store/fr3xmhr4mdh0xv5qwr8shq00133h422f-python3.6-bootstrapped-pip-9.0.1
checking for references to /build in /nix/store/fr3xmhr4mdh0xv5qwr8shq00133h422f-python3.6-bootstrapped-pip-9.0.1...
/nix/store/34hg7sdvws10c4r9bglbnadvxspww2dj-ibus-1.5.17
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Failure for system: x86_64-linux
CC window-default.o
CCLD window-default
CC plugman.o
CCLD plugman
CC sunny.o
CCLD sunny
building of ‘/nix/store/2ggnk3akh30z0bml1x0g0fsh5qwibazq-gtk+3-3.22.26.drv’ timed out after 3600 seconds
cannot build derivation ‘/nix/store/ps9klyxg26w95y3ap06jqc1bgvvvqydv-hook.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/3pp9lwaai9x8hk2lpbz8v416z1nwimmn-ibus-1.5.17.drv’: 2 dependencies couldn't be built
error: build of ‘/nix/store/3pp9lwaai9x8hk2lpbz8v416z1nwimmn-ibus-1.5.17.drv’ failed
0b99960
to
571b66e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Failure for system: x86_64-linux
libtool: warning: relinking 'im-inuktitut.la'
libtool: install: (cd /tmp/nix-build-gtk+3-3.22.26.drv-0/gtk+-3.22.26/modules/input; /nix/store/65l6hr8snf4v823f974k97jc65i7bhvf-bash-4.4-p12/bin/bash "/tmp/nix-build-gtk+3-3.22.26.drv-0/gtk+-3.22.26/libtool" --silent --tag CC --mode=relink gcc -g -O2 -Wall -rpath /nix/store/32w8kdpy6ykj23q95vkdv50zxxiclv6g-gtk+3-3.22.26/lib/gtk-3.0/3.0.0/immodules -avoid-version -module -o im-inuktitut.la -rpath /nix/store/32w8kdpy6ykj23q95vkdv50zxxiclv6g-gtk+3-3.22.26/lib/gtk-3.0/3.0.0/immodules iminuktitut.lo ../../gtk/libgtk-3.la -L/nix/store/ciz98qjymi65iaq535nylgi36mx9m6jl-glib-2.54.2/lib -L/nix/store/vgxcfqdr0bg7208lx1zvqgk1552aj2jw-libxkbcommon-0.7.2/lib -L/nix/store/5xa736rky9qh6f7q6bmrifi3dv69frkc-epoxy-1.3.1/lib -L/nix/store/xsc1vqqs5d72f1pjfds5sdf6qzjgqj7b-cairo-1.14.10/lib -L/nix/store/93n4kksb0bkmx8j980pg1yxin4xfmzdn-fontconfig-2.12.1-lib/lib -L/nix/store/gxyg8jmcfw3khyj1qi1sha15ysd8yvig-freetype-2.7.1/lib -L/nix/store/x4cqrnzcvcc1lqvz41cp0dxqbnvsmhfk-libX11-1.6.5/lib -L/nix/store/bwrmg4vx7734hzyg41raaix5w12jnbzc-mesa-noglu-17.2.7/lib -L/nix/store/ihc09b12dnl7a596shvanrw34bvnkgkm-libXdamage-1.1.4/lib -L/nix/store/8jhjp4v16arm59cww1s9aha6hbjz7cwr-libXfixes-5.0.2/lib -L/nix/store/n0ng6gd5rcv5yz9w9rpdhpcwpnbmgq0s-pango-1.40.14/lib -L/nix/store/3z0rrpdfsiha2qjrhcbw0y3di0cv9nkz-gdk-pixbuf-2.36.7/lib -L/nix/store/djnbk5pmnb0zj8h2hxlmkyz4z5dck5gl-atk-2.26.1/lib -L/nix/store/vhhpp8hq48w7d1m8sdzhnzw1wyrn14zj-at-spi2-atk-2.26.1/lib -L/nix/store/mk0bgbf7y6ixygmr7yrkr0287bijmhdp-libXcomposite-0.4.4/lib -L/nix/store/jkgrv5ga89j8z4wfh9c3qk5xm01qzcby-libXi-1.7.9/lib -L/nix/store/8y125i89fkkx7x84fdgx2ad1cf3my4ml-wayland-1.14.0/lib -lpangocairo-1.0 -lX11 -lXi -lXcomposite -lXdamage -lXfixes -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -latk-1.0 -latk-bridge-2.0 -lxkbcommon -lwayland-cursor -lwayland-egl -lwayland-client -lepoxy -lpangoft2-1.0 -lpango-1.0 -lfontconfig -lfreetype -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm )
libtool: install: /nix/store/hw5a3mifkrzd8y0pxs7nzzr4yscg08mw-coreutils-8.28/bin/install -c .libs/im-inuktitut.soT /nix/store/32w8kdpy6ykj23q95vkdv50zxxiclv6g-gtk+3-3.22.26/lib/gtk-3.0/3.0.0/immodules/im-inuktitut.so
libtool: install: /nix/store/hw5a3mifkrzd8y0pxs7nzzr4yscg08mw-coreutils-8.28/bin/install -c .libs/im-inuktitut.lai /nix/store/32w8kdpy6ykj23q95vkdv50zxxiclv6g-gtk+3-3.22.26/lib/gtk-3.0/3.0.0/immodules/im-inuktitut.la
libtool: warning: relinking 'im-ipa.la'
libtool: install: (cd /tmp/nix-build-gtk+3-3.22.26.drv-0/gtk+-3.22.26/modules/input; /nix/store/65l6hr8snf4v823f974k97jc65i7bhvf-bash-4.4-p12/bin/bash "/tmp/nix-build-gtk+3-3.22.26.drv-0/gtk+-3.22.26/libtool" --silent --tag CC --mode=relink gcc -g -O2 -Wall -rpath /nix/store/32w8kdpy6ykj23q95vkdv50zxxiclv6g-gtk+3-3.22.26/lib/gtk-3.0/3.0.0/immodules -avoid-version -module -o im-ipa.la -rpath /nix/store/32w8kdpy6ykj23q95vkdv50zxxiclv6g-gtk+3-3.22.26/lib/gtk-3.0/3.0.0/immodules imipa.lo ../../gtk/libgtk-3.la -L/nix/store/ciz98qjymi65iaq535nylgi36mx9m6jl-glib-2.54.2/lib -L/nix/store/vgxcfqdr0bg7208lx1zvqgk1552aj2jw-libxkbcommon-0.7.2/lib -L/nix/store/5xa736rky9qh6f7q6bmrifi3dv69frkc-epoxy-1.3.1/lib -L/nix/store/xsc1vqqs5d72f1pjfds5sdf6qzjgqj7b-cairo-1.14.10/lib -L/nix/store/93n4kksb0bkmx8j980pg1yxin4xfmzdn-fontconfig-2.12.1-lib/lib -L/nix/store/gxyg8jmcfw3khyj1qi1sha15ysd8yvig-freetype-2.7.1/lib -L/nix/store/x4cqrnzcvcc1lqvz41cp0dxqbnvsmhfk-libX11-1.6.5/lib -L/nix/store/bwrmg4vx7734hzyg41raaix5w12jnbzc-mesa-noglu-17.2.7/lib -L/nix/store/ihc09b12dnl7a596shvanrw34bvnkgkm-libXdamage-1.1.4/lib -L/nix/store/8jhjp4v16arm59cww1s9aha6hbjz7cwr-libXfixes-5.0.2/lib -L/nix/store/n0ng6gd5rcv5yz9w9rpdhpcwpnbmgq0s-pango-1.40.14/lib -L/nix/store/3z0rrpdfsiha2qjrhcbw0y3di0cv9nkz-gdk-pixbuf-2.36.7/lib -L/nix/store/djnbk5pmnb0zj8h2hxlmkyz4z5dck5gl-atk-2.26.1/lib -L/nix/store/vhhpp8hq48w7d1m8sdzhnzw1wyrn14zj-at-spi2-atk-2.26.1/lib -L/nix/store/mk0bgbf7y6ixygmr7yrkr0287bijmhdp-libXcomposite-0.4.4/lib -L/nix/store/jkgrv5ga89j8z4wfh9c3qk5xm01qzcby-libXi-1.7.9/lib -L/nix/store/8y125i89fkkx7x84fdgx2ad1cf3my4ml-wayland-1.14.0/lib -lpangocairo-1.0 -lX11 -lXi -lXcomposite -lXdamage -lXfixes -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -latk-1.0 -latk-bridge-2.0 -lxkbcommon -lwayland-cursor -lwayland-egl -lwayland-client -lepoxy -lpangoft2-1.0 -lpango-1.0 -lfontconfig -lfreetype -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lm )
building of ‘/nix/store/2ggnk3akh30z0bml1x0g0fsh5qwibazq-gtk+3-3.22.26.drv’ timed out after 3600 seconds
cannot build derivation ‘/nix/store/ps9klyxg26w95y3ap06jqc1bgvvvqydv-hook.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/3pp9lwaai9x8hk2lpbz8v416z1nwimmn-ibus-1.5.17.drv’: 2 dependencies couldn't be built
error: build of ‘/nix/store/3pp9lwaai9x8hk2lpbz8v416z1nwimmn-ibus-1.5.17.drv’ failed
571b66e
to
9113645
Compare
@orivej I've rebuilt it and it works. This should be ready to merge. |
I'm in the process of switching to the system with this PR, will merge after testing. |
After rebasing this on the current master (for testing),
|
Adding |
This fixes ibus-setup. * Update cldrEmojiAnnotation: 31.0.1_1 -> 31.90.0_1 * Move ibus-setup back to out, and use a smaller Python 3 at runtime than doesn't pull in some dev paths * Build from Git * Use autoreconfHook so that we don't have to patch ./configure scripts when we could just generate them correctly in the first place * Drop patch that removes IBUS_* environment variables from ibus-setup wrapper: unsetting them breaks ibus-setup * Add withWayland option (building with Wayland requires libxcbcommon package, previously wayland was included into buildInputs w/o libxcbcommon and respective configure flag) * Add license (LGPLv2.1) Relies on two other commits in this branch that add GI_TYPELIB_PATH discovery and fix gconf Python scripts.
Some derivations need to discover their own typelibs. giDiscoverSelf runs as a preFixupPhase and populates GI_TYPELIB_PATH with an entry pointing to $prefix/lib/girepository-1.0, if it exists.
9113645
to
0dff26d
Compare
I've been trying this out on nixos-unstable since yesterday, and it seems to work as well as before. |
@laMudri: Thanks for testing! I have also tried it out, and changing |
Motivation for this change
Fixes #30265, fixes #31454.
ibus-setup
is not broken anymore../configure
scripts when we could just generate them correctlyibus-setup
Relies on two other commits in this branch that add
GI_TYPELIB_PATH
discovery and fixgconf
Python scripts (fixes #31083)./cc @edolstra @globin
Things done
build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)