diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/inputmethods/ibus/fix-paths.patch')
| -rw-r--r-- | nixpkgs/pkgs/tools/inputmethods/ibus/fix-paths.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus/fix-paths.patch b/nixpkgs/pkgs/tools/inputmethods/ibus/fix-paths.patch new file mode 100644 index 000000000000..340ec22130f0 --- /dev/null +++ b/nixpkgs/pkgs/tools/inputmethods/ibus/fix-paths.patch @@ -0,0 +1,51 @@ +diff --git a/configure.ac b/configure.ac +index a3cdb2da..cade9466 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -469,11 +469,11 @@ PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED], + 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 +@@ -502,7 +502,7 @@ if test x"$enable_python_library" = x"yes"; then + PYTHON2_VERSION=`$PYTHON2 -c "import sys; sys.stdout.write(sys.version[[:3]])"` + PYTHON2_LIBDIR="$PYTHON2_PREFIX/lib/python$PYTHON2_VERSION" + python2dir="$PYTHON2_LIBDIR/site-packages" +- pkgpython2dir="$python2dir/ibus" ++ pkgpython2dir="$prefix/@pythonSitePackages@/ibus" + AC_SUBST(pkgpython2dir) + else + enable_python_library="no (disabled, use --enable-python-library to enable)" +diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am +index 5360f033..6d5e726f 100644 +--- a/data/dconf/Makefile.am ++++ b/data/dconf/Makefile.am +@@ -50,7 +50,7 @@ man_5dir = $(mandir)/man5 + + install-data-hook: + if test -z "$(DESTDIR)"; then \ +- dconf update; \ ++ true; \ + fi + + EXTRA_DIST = \ +diff --git a/setup/ibus-setup.in b/setup/ibus-setup.in +index 474ce8a8..ee30808e 100644 +--- a/setup/ibus-setup.in ++++ b/setup/ibus-setup.in +@@ -27,5 +27,5 @@ export IBUS_PREFIX=@prefix@ + export IBUS_DATAROOTDIR=@datarootdir@ + export IBUS_LOCALEDIR=@localedir@ + export IBUS_LIBEXECDIR=${libexecdir} +-exec ${PYTHON:-@PYTHON@} @prefix@/share/ibus/setup/main.py "$@" ++exec @pythonInterpreter@ @prefix@/share/ibus/setup/main.py "$@" + |