[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
54/163: gnu: ibus-anty: Wrap with the new Guix PYTHONPATH.
From: |
guix-commits |
Subject: |
54/163: gnu: ibus-anty: Wrap with the new Guix PYTHONPATH. |
Date: |
Mon, 25 Jan 2021 02:01:29 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit 37c5df33a6bc5ffaaaff52f6b5a0e4eca24faea4
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 00:14:05 2021 -0500
gnu: ibus-anty: Wrap with the new Guix PYTHONPATH.
* gnu/packages/ibus.scm (ibus-anty): Delete trailing #t.
[phases]{wrap-programs}: Use the new Guix PYTHONPATH.
---
gnu/packages/ibus.scm | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index f350f06..34895f6 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -266,24 +266,28 @@ Chinese pinyin input methods.")
"1y8sf837rmp662bv6zakny0xcm7c9c5qda7f9kq9riv9ywpcbw6x"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags
+ '(#:imported-modules ,(cons '(guix build python-build-system)
+ %gnu-build-system-modules)
+ #:modules ((guix build gnu-build-system)
+ ((guix build python-build-system) #:select (guix-pythonpath))
+ (guix build utils))
+ #:configure-flags
;; Use absolute exec path in the anthy.xml.
(list (string-append "--libexecdir=" %output "/libexec"))
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-programs
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (pythonpath (guix-pythonpath inputs)))
(for-each
(lambda (prog)
(wrap-program (string-append out "/libexec/" prog)
- `("PYTHONPATH" ":" prefix
- (,(getenv "PYTHONPATH")))
+ `(,pythonpath ":" prefix (,(getenv pythonpath)))
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH")
,(string-append out "/lib/girepository-1.0")))))
- '("ibus-engine-anthy" "ibus-setup-anthy"))
- #t))))))
+ '("ibus-engine-anthy" "ibus-setup-anthy"))))))))
(native-inputs
`(("gettext" ,gettext-minimal)
("intltool" ,intltool)
- 09/163: gnu: dstat: Adjust wrap phase., (continued)
- 09/163: gnu: dstat: Adjust wrap phase., guix-commits, 2021/01/25
- 10/163: gnu: solaar: Do not read PYTHONPATH from environment., guix-commits, 2021/01/25
- 04/163: build/python: Replace PYTHONPATH by GUIX_PYTHONPATH_X_Y in add-installed-pythonpath., guix-commits, 2021/01/25
- 18/163: gnu: couger: Adjust wrap phase., guix-commits, 2021/01/25
- 11/163: gnu: intel-xed: Adjust build phase., guix-commits, 2021/01/25
- 03/163: build/python: Add a new guix-pythonpath procedure., guix-commits, 2021/01/25
- 22/163: gnu: python-scanpy: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 21/163: gnu: filtlong: Adjust wrap phase., guix-commits, 2021/01/25
- 24/163: gnu: cdemu-client: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 25/163: gnu: python-loompy: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 54/163: gnu: ibus-anty: Wrap with the new Guix PYTHONPATH.,
guix-commits <=
- 58/163: gnu: python-django-contact-form: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 65/163: gnu: kicad: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 62/163: gnu: python-django-statici18n: Do not read PYTHONPATH., guix-commits, 2021/01/25
- 35/163: gnu: gitless: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 41/163: gnu: blanket: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 71/163: gnu: notifymuch: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 97/163: gnu: 389-ds-base: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 104/163: gnu: python-pynacl: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 90/163: gnu: python-fenics-ffc: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 81/163: gnu: kajongg: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25