diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-22 11:08:57 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-02-01 11:53:43 -0500 |
| commit | 8a15ecf0e3434f82194b8ccafbcfaafb5d323749 (patch) | |
| tree | 37778afb7120586cf830a7807fc9a2010983410b | |
| parent | 15dcffecf2293c86d81186a6e3a29e25b00420aa (diff) | |
| download | guix-8a15ecf0e3434f82194b8ccafbcfaafb5d323749.tar.gz | |
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.
| -rw-r--r-- | guix/build/python-build-system.scm | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index c73f6b0603..0f2402d3a3 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 |