~ruther/guix-local: build/python: Adjust wrap phase to use the new GUIX_PYTHONPATH.

8a15ecf0e3434f82194b8ccafbcfaafb5d323749 — Maxim Cournoyer 5 years ago 15dcffe

build/python: Adjust wrap phase to use the new GUIX_PYTHONPATH.

* guix/build/python-build-system.scm (wrap): Adjust to use the new
GUIX_PYTHONPATH.  Remove trailing #t.

patch browse .tar.gz .zip

1 files changed, 7 insertions(+), 9 deletions(-)

M guix/build/python-build-system.scm

M guix/build/python-build-system.scm => guix/build/python-build-system.scm +7 -9

@@ 220,21 220,19 @@ running checks after installing the package."
 
   (define bindirs
     (append-map (match-lambda
-                 ((_ . dir)
-                  (list (string-append dir "/bin")
-                        (string-append dir "/sbin"))))
+                  ((_ . dir)
+                   (list (string-append dir "/bin")
+                         (string-append dir "/sbin"))))
                 outputs))
 
-  (let* ((var `("PYTHONPATH" prefix
-                ,(cons (site-packages inputs outputs)
-                       (search-path-as-string->list
-                        (or (getenv "PYTHONPATH") ""))))))
+  (let* ((var `("GUIX_PYTHONPATH" prefix
+                ,(search-path-as-string->list
+                  (or (getenv "GUIX_PYTHONPATH") "")))))
     (for-each (lambda (dir)
                 (let ((files (list-of-files dir)))
                   (for-each (cut wrap-program <> var)
                             files)))
-              bindirs)
-    #t))
+              bindirs)))
 
 (define* (rename-pth-file #:key name inputs outputs #:allow-other-keys)
   "Rename easy-install.pth to NAME.pth to avoid conflicts between packages