From 7ddb15de83fc0bb99c111175ebe5326418f018a6 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 17 Jun 2025 00:40:45 +0200 Subject: [PATCH] gnu: gajim: Switch to pyproject-build-system. * gnu/packages/messaging.scm (gajim) [build-system]: Switch to pyproject-build-system. [arguments]{modules, imported-modules}: Switch to pyproject-build-system. {phases}: Remove 'build and 'install replacements. Adjust 'wrap phase ordering. Change-Id: I1c07994236d97821da0e4dd14f1d22758fe5c693 Signed-off-by: Sharlatan Hellseher --- gnu/packages/messaging.scm | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 599098c22ef..6f6836e6498 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1235,14 +1235,14 @@ of xmpppy.") (base32 "0g2nhy6ypj4jbz216sgiy37spq34bwa0ydn2g73fp9qnxfq4vpvz")) (patches (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:imported-modules - `(,@%python-build-system-modules + `(,@%pyproject-build-system-modules (guix build glib-or-gtk-build-system)) #:modules - '((guix build python-build-system) + '((guix build pyproject-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) #:phases @@ -1253,17 +1253,6 @@ of xmpppy.") (add-before 'build 'build-metadata (lambda _ (invoke "./make.py" "build"))) - ;; TODO: Change to pyproject-build-system once it supports - ;; in-tree build backends. - (replace 'build - (lambda _ - (invoke "python" "-m" "build" "--wheel" "--no-isolation" - "."))) - (replace 'install - (lambda _ - (apply invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output - (find-files "dist" "\\.whl$")))) (add-after 'install 'install-metadata (lambda _ (invoke "./make.py" "install" @@ -1278,13 +1267,13 @@ of xmpppy.") (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "python" "-m" "unittest" "discover" "-s" "test")))) - (add-after 'install 'glib-or-gtk-compile-schemas + (add-after 'wrap 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'install 'glib-or-gtk-wrap + (add-after 'wrap 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) - (add-after 'install 'wrap-env + (add-after 'wrap 'wrap-env (lambda _ (for-each (lambda (name)