[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
114/163: gnu: gnome-todo: Wrap with the new Guix PYTHONPATH.
From: |
guix-commits |
Subject: |
114/163: gnu: gnome-todo: Wrap with the new Guix PYTHONPATH. |
Date: |
Mon, 25 Jan 2021 02:01:47 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit f4fc0a0dead4c02ff933ae0fbf948b8c1004c29c
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jan 24 00:12:41 2021 -0500
gnu: gnome-todo: Wrap with the new Guix PYTHONPATH.
* gnu/packages/gnome.scm (gnome-todo): Delete trailing #t.
[arguments]: Import and use the (guix build python-build-system) module.
[phases]{python-gnome-todo}: Wrap with the new Guix PYTHONPATH.
---
gnu/packages/gnome.scm | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 601d2bb..b2d55b6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9439,21 +9439,25 @@ desktop. It supports multiple calendars, month, week
and year view.")
(search-patches "gnome-todo-delete-esource-duplicate.patch"))))
(build-system meson-build-system)
(arguments
- '(#:glib-or-gtk? #t
+ '(#:imported-modules ,(cons '(guix build python-build-system)
+ %meson-build-system-modules)
+ #:modules ((guix build meson-build-system)
+ ((guix build python-build-system) #:select (guix-pythonpath))
+ (guix build utils))
+ #:glib-or-gtk? #t
#:phases (modify-phases %standard-phases
(add-after
'install 'wrap-gnome-todo
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
- (python-path (getenv "PYTHONPATH")))
+ (pythonpath (guix-pythonpath inputs)))
(wrap-program (string-append out "/bin/gnome-todo")
;; XXX: gi plugins are broken.
;; See
https://bugzilla.gnome.org/show_bug.cgi?id=787212
;; For plugins.
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
- `("PYTHONPATH" ":" prefix (,python-path))))
- #t)))))
+ `(,pythonpath ":" prefix (,(getenv
pythonpath))))))))))
(native-inputs
`(("gettext" ,gettext-minimal)
("gobject-introspection" ,gobject-introspection)
- 151/163: gnu: python-apispec: Do not set PYTHONPATH., (continued)
- 151/163: gnu: python-apispec: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 152/163: gnu: python-flasgger: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 153/163: gnu: python2-send2trash: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 155/163: gnu: python-asgiref: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 156/163: gnu: python-aws-xray-sdk: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 160/163: gnu: python-flask: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 162/163: gnu: python-webassets: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 147/163: gnu: python-pyelftools: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 115/163: gnu: orca: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 82/163: gnu: inkscape-1.0: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 114/163: gnu: gnome-todo: Wrap with the new Guix PYTHONPATH.,
guix-commits <=
- 123/163: gnu: python-typed-ast: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 137/163: gnu: python-flake8-polyfill: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 138/163: gnu: python-msgpack: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 19/163: gnu: python-screed: Adjust following Python build system changes., guix-commits, 2021/01/25
- 43/163: gnu: ghmm: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 67/163: gnu: freecad: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 61/163: gnu: python-django-appconf: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 40/163: gnu: manuskript: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 72/163: gnu: python-hyperkitty: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 79/163: gnu: gdk-pixbuf: Update to 2.42.2., guix-commits, 2021/01/25