diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2026-01-28 10:03:21 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-02-07 12:28:50 +0100 |
| commit | d30e5fccc436503c2aa45c23960c3ad05bb4b6b8 (patch) | |
| tree | 6588c66830a529126135a5f93c9cc4ee120158be | |
| parent | e9ccc03c8104c5be20b7f72e381f631e4bb62c99 (diff) | |
gnu: confy: Switch to pyproject.
* gnu/packages/gnome.scm (confy):
[arguments]<#:imported-modules, #:modules, #:phases>: Switch to
pyproject-build-system.
<#:phases>: Remove phase 'patch-for-compatibility.
Change-Id: Idd48f3e14702f09070a7340e05a0ea1eec5a6608
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
| -rw-r--r-- | gnu/packages/gnome.scm | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 027589d5bb1..51b57687631 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -14241,10 +14241,10 @@ Protocol} for @acronym{VoIP, Voice over @acronym{IP, Internet Protocol}}.") (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t - #:imported-modules `(,@%meson-build-system-modules - (guix build python-build-system)) + #:imported-modules (append %meson-build-system-modules + %pyproject-build-system-modules) #:modules '((guix build meson-build-system) - ((guix build python-build-system) #:prefix python:) + ((guix build pyproject-build-system) #:prefix py:) (guix build utils)) #:phases #~(modify-phases %standard-phases @@ -14255,17 +14255,12 @@ Protocol} for @acronym{VoIP, Voice over @acronym{IP, Internet Protocol}}.") "gtk_update_icon_cache: false") (("update_desktop_database: true") "update_desktop_database: false")))) - (add-after 'unpack 'patch-for-compatibility - (lambda _ - ;; TODO: Remove when Python is updated to >= 3.11. - (substitute* (find-files "." "\\.py$") - (("import Self") "import Any as Self")))) (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/confy") `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") - ,(python:site-packages inputs outputs))) + ,(py:site-packages inputs outputs))) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) (inputs (list gtk libadwaita |