diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2026-01-28 09:59:36 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-02-07 12:28:50 +0100 |
| commit | e9ccc03c8104c5be20b7f72e381f631e4bb62c99 (patch) | |
| tree | 8e7aa31564c38496cd5d7c3af03cf1cbb972d6ef | |
| parent | 7c7025cdb90ebaf86acf72a5c82df55e491e3a53 (diff) | |
gnu: piper: Switch to pyproject.
* gnu/packages/gnome.scm (piper):
[arguments]: Improve style, use gexps.
<#:imported-modules, #:modules, #:phases>: Switch to
pyproject-build-system.
Change-Id: I00092d1fddaaab7825b625b344cacaf61986a4ae
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
| -rw-r--r-- | gnu/packages/gnome.scm | 49 |
1 files changed, 26 insertions, 23 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e8b4ea5ed4c..027589d5bb1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13180,31 +13180,34 @@ your operating-system definition: (file-name (git-file-name name version)))) (build-system meson-build-system) (arguments - `(#:imported-modules ((guix build python-build-system) - ,@%meson-build-system-modules) - #:modules (((guix build python-build-system) #:prefix python:) + (list + #:imported-modules (append %meson-build-system-modules + %pyproject-build-system-modules) + #:modules `(((guix build pyproject-build-system) #:prefix py:) (guix build meson-build-system) (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'dont-update-gtk-icon-cache - (lambda _ - (substitute* "meson.build" - (("gtk_update_icon_cache: true") - "gtk_update_icon_cache: false")))) - (add-after 'unpack 'do-not-require-flake8 - (lambda _ - (substitute* "meson.build" - (("find_program\\('flake8'" all) - (string-append all ", required : false"))))) - (add-after 'install 'wrap-python - (assoc-ref python:%standard-phases 'wrap)) - (add-after 'wrap-python 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-script (search-input-file outputs "bin/piper") - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))) - `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") - ,(python:site-packages inputs outputs))))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'dont-update-gtk-icon-cache + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) + (add-after 'unpack 'do-not-require-flake8 + (lambda _ + (substitute* "meson.build" + (("find_program\\('flake8'" all) + (string-append all ", required : false"))))) + (add-after 'install 'wrap-python + (assoc-ref py:%standard-phases 'wrap)) + (add-after 'wrap-python 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-script (search-input-file outputs "bin/piper") + `("GI_TYPELIB_PATH" = + (,(getenv "GI_TYPELIB_PATH"))) + `("GUIX_PYTHONPATH" = + (,(getenv "GUIX_PYTHONPATH") + ,(py:site-packages inputs outputs))))))))) (native-inputs (list appstream desktop-file-utils ;for update-desktop-database |