mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 14:07:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ibus-minimal: Move Python support to ibus.

Browse source 
This reduces the size of ibus-minimal from 1446.7 MiB to 1222.3 MiB.

* gnu/packages/ibus.scm (ibus-minimal): Remove "--enable-python-library" flag.
[phases] {wrap-with-additional-paths}: Do not wrap GUIX_PYTHONPATH.
[inputs]: Move python-pygobject, python and python-dbus to...
(ibus) [inputs]: ... here.
[arguments]: Add --enable-python-library configure flag and override
wrap-with-additional-paths phase.
This commit is contained in:
Maxim Cournoyer 2023-02-07 11:45:40 -05:00
parent fcd80d3089
commit 2d3a33589d
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gnu/packages/ibus.scm
View file

@ -10,7 +10,7 @@
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Songlin Jiang <hollowman@hollowman.ml>
;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;;
;;; This file is part of GNU Guix.
@ -91,8 +91,7 @@ (define-public ibus-minimal
(outputs '("out" "doc"))
(arguments
(list
#:configure-flags #~(list "--enable-python-library"
"--enable-gtk-doc"
#:configure-flags #~(list "--enable-gtk-doc"
"--enable-memconf"
(string-append
"--with-unicode-emoji-dir="
@ -186,10 +185,8 @@ (define-public ibus-minimal
(string-append #$output:doc "/share/gtk-doc"))))
(add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and
;; GI_TYPELIB_PATH.
;; Make sure 'ibus-setup' runs with the correct GI_TYPELIB_PATH.
(wrap-program (search-input-file outputs "bin/ibus-setup")
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH")
,(string-append #$output "/lib/girepository-1.0")))))))))
@ -206,9 +203,6 @@ (define-public ibus-minimal
libx11
libxkbcommon
libxtst
python-pygobject
python
python-dbus
setxkbmap
ucd
unicode-cldr-common
@ -244,11 +238,29 @@ (define-public ibus-minimal
(define-public ibus
(package/inherit ibus-minimal
(arguments (substitute-keyword-arguments (package-arguments ibus-minimal)
((#:configure-flags flags)
#~(cons* "--enable-gtk4" #$flags))))
(arguments
(substitute-keyword-arguments (package-arguments ibus-minimal)
((#:configure-flags flags)
#~(cons* "--enable-gtk4"
"--enable-python-library"
#$flags))
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
(replace 'wrap-with-additional-paths
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure 'ibus-setup' runs with the correct
;; GUIX_PYTHONPATH and GI_TYPELIB_PATH.
(wrap-program (search-input-file outputs "bin/ibus-setup")
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH")
,(string-append #$output "/lib/girepository-1.0"))))))))))
(inputs (modify-inputs (package-inputs ibus-minimal)
(prepend gtk pango-next)))
(prepend gtk
pango-next
python
python-dbus
python-pygobject)))
(properties (alist-delete 'hidden? (package-properties ibus-minimal)))))
(define-public ibus-libpinyin