From 5225da141cad85682cf1f96b4891b5e3a30b15b6 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Wed, 13 Aug 2025 16:54:39 +0200 Subject: [PATCH] gnu: xdot: Switch to pyproject. * gnu/packages/graphviz.scm (xdot): [build-system]: Switch to pyproject-build-system. [arguments]<#:phases>: Replace 'wrap phase instead. Use gexps. [native-inputs]: Add python-setuptools, python-wheel. Change-Id: Id7493956a302e1fe7d1b29973d845c807a4e954d Signed-off-by: Sharlatan Hellseher --- gnu/packages/graphviz.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 40a5cf74011390dd9e750a0178d5d470fff6c1a8..1e78a9de2773b14d433b6facb0a3eb8533d89680 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -327,7 +327,7 @@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/predicates_init.c \ (file-name (git-file-name name version)) (sha256 (base32 "1l34ahvcz90j3j7aspp9wqvxpq10mzgq7l0sanrj142ihdnbahvy")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -350,13 +350,12 @@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/predicates_init.c \ (setenv "LD_LIBRARY_PATH" (dirname lib))))) ;; We wrap xdot, so that we don't propagate gtk+ and graphviz - (add-after 'install 'wrap + (replace 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (graphviz (assoc-ref inputs "graphviz")) + (let ((graphviz (assoc-ref inputs "graphviz")) (gi-typelib-path (getenv "GI_TYPELIB_PATH")) (python-path (getenv "GUIX_PYTHONPATH"))) - (wrap-program (string-append out "/bin/xdot") + (wrap-program (string-append #$output "/bin/xdot") `("PATH" ":" prefix (,(string-append graphviz "/bin"))) `("GI_TYPELIB_PATH" ":" prefix @@ -381,6 +380,8 @@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/predicates_init.c \ python-numpy python-pycairo python-pygobject + python-setuptools + python-wheel vulkan-loader)) (home-page "https://pypi.org/project/xdot/") (synopsis "Interactive viewer for graphviz dot files")