From aa38b72f51467ae613facdb3e00446cb80255a67 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sat, 9 Nov 2024 16:57:50 +0100 Subject: [PATCH] =?UTF-8?q?ibus:=201.5.30=20=E2=86=92=201.5.31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diff: https://github.com/ibus/ibus/compare/1.5.30...1.5.31 --- pkgs/tools/inputmethods/ibus/default.nix | 4 ++-- pkgs/tools/inputmethods/ibus/fix-paths.patch | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index e396b6f06444..c5b8b1c6e00a 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -58,13 +58,13 @@ in stdenv.mkDerivation rec { pname = "ibus"; - version = "1.5.30"; + version = "1.5.31"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "sha256-VgSjeKF9DCkDfE9lHEaWpgZb6ibdgoDf/I6qeJf8Ah4="; + sha256 = "sha256-YMCtLIK/9iUdS37Oiow7WMhFFPKhomNXvzWbLzlUkdQ="; }; patches = [ diff --git a/pkgs/tools/inputmethods/ibus/fix-paths.patch b/pkgs/tools/inputmethods/ibus/fix-paths.patch index 340ec22130f0..a97f22171c1e 100644 --- a/pkgs/tools/inputmethods/ibus/fix-paths.patch +++ b/pkgs/tools/inputmethods/ibus/fix-paths.patch @@ -2,12 +2,13 @@ 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 +@@ -531,12 +531,12 @@ PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED]) -- pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"` -+ pyoverridesdir="$prefix/@pythonSitePackages@/gi/overrides" + if test x"$pyoverridesdir" = x""; then +- pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"` ++ pyoverridesdir="$prefix/@pythonSitePackages@/gi/overrides" + fi AC_SUBST(pyoverridesdir) if test x"$enable_python2" = x"yes"; then