apteryx pushed a commit to branch cu/farewell-to-pythonpath in repository guix.
commit c53daa7940a28456c0d4cb9a5c42143423e24ff3 Author: Maxim Cournoyer <[email protected]> AuthorDate: Fri Jan 22 11:08:57 2021 -0500 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. --- guix/build/python-build-system.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index c73f6b0..0f2402d 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -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
