guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/08: gnu: python-graph-tool: Remove input labels.


From: guix-commits
Subject: 04/08: gnu: python-graph-tool: Remove input labels.
Date: Fri, 17 Dec 2021 13:08:56 -0500 (EST)

mbakke pushed a commit to branch master
in repository guix.

commit a133a0288c7808e9f28c9c64c9ce4ae146ceba04
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Dec 17 00:11:44 2021 +0100

    gnu: python-graph-tool: Remove input labels.
    
    * gnu/packages/graph.scm (python-graph-tool)[arguments]: Import 
SITE-PACKAGES
    from (guix build python-build-system), and use instead of homegrown 
procedure.
    [native-inputs, inputs]: Remove labels.
---
 gnu/packages/graph.scm | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index ac40996..084fdf8 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -540,30 +540,26 @@ transformed into common image formats for display or 
printing.")
                 "0v58in4rwk9fhjarjw6xfxpx5zz2z13sy3yvd14b5kr0884yw6sz"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags
+     `(#:imported-modules (,@%gnu-build-system-modules
+                           (guix build python-build-system))
+       #:modules (,@%gnu-build-system-modules
+                  ((guix build python-build-system) #:select (site-packages)))
+       #:configure-flags
        (list (string-append "--with-boost="
                             (assoc-ref %build-inputs "boost"))
              (string-append "--with-python-module-path="
-                            (assoc-ref %outputs "out")
-                            "/lib/python"
-                            ,(version-major+minor
-                              (package-version
-                               (car (assoc-ref
-                                     (package-inputs this-package)
-                                     "python"))))
-                            "/site-packages/"))))
+                            (site-packages %build-inputs %outputs)))))
     (native-inputs
-     `(("ncurses" ,ncurses)
-       ("pkg-config" ,pkg-config)))
+     (list ncurses pkg-config))
     (inputs
-     `(("boost" ,boost)
-       ("cairomm" ,cairomm-1.14)
-       ("cgal" ,cgal)
-       ("expat" ,expat)
-       ("gmp" ,gmp)
-       ("gtk+" ,gtk+)
-       ("python" ,python-wrapper)
-       ("sparsehash" ,sparsehash)))
+     (list boost
+           cairomm-1.14
+           cgal
+           expat
+           gmp
+           gtk+
+           python-wrapper
+           sparsehash))
     (propagated-inputs
      (list python-matplotlib python-numpy python-pycairo python-scipy))
     (synopsis "Manipulate and analyze graphs with Python efficiently")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]