Skip to content
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

Merged
merged 3 commits into from Dec 31, 2017
Merged

ibus: 1.5.16 -> 1.5.17, fix #31094

merged 3 commits into from Dec 31, 2017

Conversation

lukateras
Copy link
Member

@lukateras lukateras commented Nov 1, 2017

Motivation for this change

Fixes #30265, fixes #31454. ibus-setup is not broken anymore.

  • Update cldrEmojiAnnotation: 31.0.1_1 -> 31.90.0_1
  • Build from Git so that we don't have to patch ./configure scripts when we could just generate them correctly
  • Drop patch that removes IBUS_* environment variables from ibus-setup wrapper: they are actually set correctly, and we don't set them which 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 (fixes #31083).

/cc @edolstra @globin

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@grahamc
Copy link
Member

grahamc commented Nov 1, 2017

This seems to cause an evaluation error for me

@lukateras
Copy link
Member Author

@grahamc Strange, it didn't for me. Perhaps I've rebased incorrectly, hold on...

@grahamc
Copy link
Member

grahamc commented Nov 1, 2017

error: while evaluating anonymous function at /run/user/1000/nix-rebuild-amount-EstARSxV:13:12, called from /run/user/1000/nix-rebuild-amount-WfmnwnPI/lib/attrsets.nix:199:52:
while evaluating the attribute ‘x86_64-linux’ at /run/user/1000/nix-rebuild-amount-WfmnwnPI/lib/attrsets.nix:185:41:
while evaluating anonymous function at /run/user/1000/nix-rebuild-amount-WfmnwnPI/pkgs/top-level/release-lib.nix:66:6, called from /run/user/1000/nix-rebuild-amount-WfmnwnPI/lib/attrsets.nix:282:43:
while evaluating ‘hydraJob’ at /run/user/1000/nix-rebuild-amount-WfmnwnPI/lib/customisation.nix:157:14, called from /run/user/1000/nix-rebuild-amount-WfmnwnPI/pkgs/top-level/release-lib.nix:66:14:
while evaluating the attribute ‘drvPath’ at /run/user/1000/nix-rebuild-amount-WfmnwnPI/lib/customisation.nix:174:13:
while evaluating the attribute ‘drvPath’ at /run/user/1000/nix-rebuild-amount-WfmnwnPI/lib/customisation.nix:145:40:
while evaluating the attribute ‘nativeBuildInputs’ of the derivation ‘adapta-gtk-theme-3.91.2.147’ at /run/user/1000/nix-rebuild-amount-WfmnwnPI/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute ‘buildInputs’ of the derivation ‘gnome-shell-3.24.3’ at /run/user/1000/nix-rebuild-amount-WfmnwnPI/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute ‘buildInputs’ of the derivation ‘gnome-control-center-3.24.3’ at /run/user/1000/nix-rebuild-amount-WfmnwnPI/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating ‘getOutput’ at /run/user/1000/nix-rebuild-amount-WfmnwnPI/lib/attrsets.nix:450:23, called from undefined position:
while evaluating anonymous function at /run/user/1000/nix-rebuild-amount-WfmnwnPI/pkgs/stdenv/generic/make-derivation.nix:63:15, called from undefined position:
while evaluating ‘callPackageWith’ at /run/user/1000/nix-rebuild-amount-WfmnwnPI/lib/customisation.nix:113:35, called from /run/user/1000/nix-rebuild-amount-WfmnwnPI/pkgs/top-level/all-packages.nix:1474:10:
while evaluating ‘makeOverridable’ at /run/user/1000/nix-rebuild-amount-WfmnwnPI/lib/customisation.nix:72:24, called from /run/user/1000/nix-rebuild-amount-WfmnwnPI/lib/customisation.nix:117:8:
anonymous function at /run/user/1000/nix-rebuild-amount-WfmnwnPI/pkgs/tools/inputmethods/ibus/default.nix:1:1 called without required argument ‘gconf’, at /run/user/1000/nix-rebuild-amount-WfmnwnPI/lib/customisation.nix:74:12

@lukateras
Copy link
Member Author

lukateras commented Nov 1, 2017

Oh... I should start testing packages via nix-build -I nixpkgs=... '<nixpkgs>' -A ibus instead of nix-build -E "with import <nixpkgs> {}; callPackage ./. { ... }". I'll fix the top-level definition and be right back.

@cstrahan
Copy link
Contributor

cstrahan commented Nov 9, 2017

Thanks @yegortimoshenko! For reference, there are some other tweaks that we might ultimately need, as described in my comments here: #30265

@cstrahan
Copy link
Contributor

I'm getting this error:

error: anonymous function at /home/cstrahan/src/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix:1:1 called without required argument 'gconf', at /home/cstrahan/src/nixpkgs/lib/customisation.nix:74:12

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 { };

@lukateras
Copy link
Member Author

Definitely, this isn't completely up to date. Also, set enablePythonLibrary to false for now, it tries to install Python libraries into read-only Python 3 directory.

@cstrahan
Copy link
Contributor

Now I'm getting this error:

 /nix/store/8yd19hm3gq4vs4hwp6s2ydhzff5cnnv5-coreutils-8.28/bin/mkdir -p '/nix/store/vmzrpb6vxjir9g51anagwbcc1vs55qvx-ibus-1.5.17/share/dbus-1/services'
 /nix/store/8yd19hm3gq4vs4hwp6s2ydhzff5cnnv5-coreutils-8.28/bin/install -c -m 644 org.freedesktop.IBus.service '/nix/store/vmzrpb6vxjir9g51anagwbcc1vs55qvx-ibus-1.5.17/share/dbus-1/services'
 /nix/store/8yd19hm3gq4vs4hwp6s2ydhzff5cnnv5-coreutils-8.28/bin/mkdir -p '/nix/store/vmzrpb6vxjir9g51anagwbcc1vs55qvx-ibus-1.5.17/share/man/man1'
 /nix/store/8yd19hm3gq4vs4hwp6s2ydhzff5cnnv5-coreutils-8.28/bin/install -c -m 644 ibus-daemon.1.gz '/nix/store/vmzrpb6vxjir9g51anagwbcc1vs55qvx-ibus-1.5.17/share/man/man1'
make[3]: Leaving directory '/build/source/bus'
make[2]: Leaving directory '/build/source/bus'
make[1]: Leaving directory '/build/source/bus'
Making install in ibus
make[1]: Entering directory '/build/source/ibus'
Making install in interface
make[2]: Entering directory '/build/source/ibus/interface'
make[3]: Entering directory '/build/source/ibus/interface'
make[3]: Nothing to be done for 'install-exec-am'.
 /nix/store/8yd19hm3gq4vs4hwp6s2ydhzff5cnnv5-coreutils-8.28/bin/mkdir -p '/nix/store/sp876rk20728sv9di7nzj0bvrv9daa8z-python3-3.6.3-env/lib/python3.6/site-packages/ibus/interface'
/nix/store/8yd19hm3gq4vs4hwp6s2ydhzff5cnnv5-coreutils-8.28/bin/mkdir: cannot create directory '/nix/store/sp876rk20728sv9di7nzj0bvrv9daa8z-python3-3.6.3-env/lib/python3.6/site-packages/ibus': Permission denied
make[3]: *** [Makefile:487: install-ibus_interfacePYTHON] Error 1
make[3]: Leaving directory '/build/source/ibus/interface'
make[2]: *** [Makefile:583: install-am] Error 2
make[2]: Leaving directory '/build/source/ibus/interface'
make[1]: *** [Makefile:685: install-recursive] Error 1
make[1]: Leaving directory '/build/source/ibus'
make: *** [Makefile:682: install-recursive] Error 1
builder for '/nix/store/82aq5swxkid5kqfndg0sskx6a3r39bhd-ibus-1.5.17.drv' failed with exit code 2
cannot build derivation '/nix/store/x9ysrnqyi5mvwvg72fynffz1m2shpcx5-ibus-with-plugins-1.5.17.drv': 1 dependencies couldn't be built
error: build of '/nix/store/x9ysrnqyi5mvwvg72fynffz1m2shpcx5-ibus-with-plugins-1.5.17.drv' failed

@lukateras
Copy link
Member Author

See above :-)

@cstrahan
Copy link
Contributor

See above :-)

Real life race conditions :)

@cstrahan
Copy link
Contributor

@yegortimoshenko

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";

@lukateras
Copy link
Member Author

lukateras commented Nov 10, 2017

Thanks :-) That's one way to fix it, another one that probably doesn't require patching Autoconf script is by redefining PYTHON2_LIBDIR to $out. Anyway, this isn't going to get merged until someone finds how to stop python3.buildEnv from pulling in dev paths.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link

@GrahamcOfBorg GrahamcOfBorg left a 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

Copy link

@GrahamcOfBorg GrahamcOfBorg left a 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

Copy link

@GrahamcOfBorg GrahamcOfBorg left a 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

@lukateras lukateras changed the title ibus: 1.5.16 -> 1.5.17, move ibus-setup back to dev, a lot of other changes ibus: 1.5.16 -> 1.5.17, fix Dec 21, 2017
@lukateras
Copy link
Member Author

lukateras commented Dec 21, 2017

@orivej giDiscoverSelf hook now finally works and iterates through all outputs.

I've rebuilt it and it works. This should be ready to merge.

@orivej
Copy link
Contributor

orivej commented Dec 21, 2017

I'm in the process of switching to the system with this PR, will merge after testing.

@lukateras lukateras dismissed FRidh’s stale review December 22, 2017 01:18

Taken into consideration.

@orivej
Copy link
Contributor

orivej commented Dec 29, 2017

After rebasing this on the current master (for testing), ibus-engines.m17n does not build with:

checking for
    ibus-1.0 >= 1.4
... no
configure: error: Package requirements (
    ibus-1.0 >= 1.4
) were not met:

Package 'gobject-2.0', required by 'ibus-1.0', not found

@vcunat
Copy link
Member

vcunat commented Dec 29, 2017

Adding glib to its buildInputs fixes the build. (And other engines do build as they are.) This is caused by ibus propagating only glib.out instead of the usual glib, so that the pkg-config file is missing.

@lukateras
Copy link
Member Author

@orivej, @vcunat: Thanks a lot!

@lukateras lukateras removed the request for review from edolstra December 30, 2017 01:39
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.
@laMudri
Copy link
Contributor

laMudri commented Dec 31, 2017

I've been trying this out on nixos-unstable since yesterday, and it seems to work as well as before.

@lukateras
Copy link
Member Author

@laMudri: Thanks for testing! I have also tried it out, and changing glib.out to just glib seemed to have solved the problem. I am merging this into staging.

@lukateras lukateras merged commit d3e8211 into NixOS:staging Dec 31, 2017
@lukateras lukateras deleted the ibus/update branch March 2, 2020 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants