me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Maxim Cournoyer 2021-01-22 11:08:57 -05:00
parent 15dcffecf2
commit 8a15ecf0e3
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
guix/build/python-build-system.scm
View File

@ -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