diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
commit | 8de4131b2ddd11faa3394cf497484563068c9e7a (patch) | |
tree | ed4ed9e586c7236f09c109afdd416dac18ba8cc3 /gnu/packages/ibus.scm | |
parent | 15406013fe63f2ab238eec2d7a8adbc586806ac8 (diff) | |
parent | 45b7a8bfda5bde2e2daee4bec0ca092cd719d726 (diff) | |
download | guix-8de4131b2ddd11faa3394cf497484563068c9e7a.tar.gz guix-8de4131b2ddd11faa3394cf497484563068c9e7a.zip |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/ibus.scm')
-rw-r--r-- | gnu/packages/ibus.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index e9294fab1e..b156e2ab58 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -352,7 +352,7 @@ Chinese pinyin input methods.") (base32 "16vd0k8wm13s38869jqs3dnwmjvywgn0snnpyi41m28binhlssf8")) (patches (search-patches "ibus-anthy-fix-tests.patch")))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments (list ;; The test suite hangs (see: @@ -360,7 +360,10 @@ Chinese pinyin input methods.") #:tests? #f #:configure-flags ;; Use absolute exec path in the anthy.xml. - #~(list (string-append "--libexecdir=" #$output "/libexec")) + #~(list (string-append "--libexecdir=" #$output "/libexec") + (string-append + "--with-anthy-zipcode=" + (assoc-ref %build-inputs "anthy") "/share/anthy/zipcode.t")) ;; The test suite fails (see: ;; https://github.com/ibus/ibus-anthy/issues/28). #:phases @@ -380,6 +383,11 @@ Chinese pinyin input methods.") (substitute* "tests/test-build.sh" (("GI_TYPELIB_PATH=\\$BUILDDIR/../gir" all) (string-append all ":$GI_TYPELIB_PATH"))))) + (add-before 'configure 'pre-configure + (lambda _ + ;; We need generate new _config.py with correct PKGDATADIR. + (delete-file "setup/python3/_config.py") + (delete-file "engine/python3/_config.py"))) (add-before 'check 'prepare-for-tests (lambda* (#:key tests? #:allow-other-keys) (when tests? |