From aefb8fbc692e8e0592dcf6c6f2ec571b9bc31c67 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Jun 2019 14:59:25 +0200 Subject: [PATCH] ibus: Build introspection overrides --- pkgs/tools/inputmethods/ibus/default.nix | 1 + pkgs/tools/inputmethods/ibus/fix-paths.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index e6385a1b553..f1a364f9096 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -135,6 +135,7 @@ stdenv.mkDerivation rec { dconf gdk_pixbuf gobject-introspection + python3.pkgs.pygobject3 # for pygobject overrides gtk2 gtk3 isocodes diff --git a/pkgs/tools/inputmethods/ibus/fix-paths.patch b/pkgs/tools/inputmethods/ibus/fix-paths.patch index 3aa7ca29dc6..192aa7d6395 100644 --- a/pkgs/tools/inputmethods/ibus/fix-paths.patch +++ b/pkgs/tools/inputmethods/ibus/fix-paths.patch @@ -1,5 +1,19 @@ --- a/configure.ac +++ b/configure.ac +@@ -429,11 +429,11 @@ + if test "x$enable_pygobject" = "xyes"; then + PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED]) + +- pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"` ++ pyoverridesdir="$prefix/@pythonSitePackages@/gi/overrides" + AC_SUBST(pyoverridesdir) + + if test x"$enable_python2" = x"yes"; then +- py2overridesdir=`$PYTHON2 -c "import gi; print(gi._overridesdir)"` ++ py2overridesdir="$prefix/@pythonSitePackages@/gi/overrides" + AC_SUBST(py2overridesdir) + fi + fi @@ -462,7 +462,7 @@ PYTHON2_VERSION=`$PYTHON2 -c "import sys; sys.stdout.write(sys.version[[:3]])"` PYTHON2_LIBDIR="$PYTHON2_PREFIX/lib/python$PYTHON2_VERSION"