amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* guix/build/python-build-system.scm (wrap): Adjust to use the new
GUIX_PYTHONPATH.  Remove trailing #t.
This commit is contained in:
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
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 (define bindirs
(append-map (match-lambda (append-map (match-lambda
((_ . dir) ((_ . dir)
(list (string-append dir "/bin") (list (string-append dir "/bin")
(string-append dir "/sbin")))) (string-append dir "/sbin"))))
outputs)) outputs))
(let* ((var `("PYTHONPATH" prefix (let* ((var `("GUIX_PYTHONPATH" prefix
,(cons (site-packages inputs outputs) ,(search-path-as-string->list
(search-path-as-string->list (or (getenv "GUIX_PYTHONPATH") "")))))
(or (getenv "PYTHONPATH") ""))))))
(for-each (lambda (dir) (for-each (lambda (dir)
(let ((files (list-of-files dir))) (let ((files (list-of-files dir)))
(for-each (cut wrap-program <> var) (for-each (cut wrap-program <> var)
files))) files)))
bindirs) bindirs)))
#t))
(define* (rename-pth-file #:key name inputs outputs #:allow-other-keys) (define* (rename-pth-file #:key name inputs outputs #:allow-other-keys)
"Rename easy-install.pth to NAME.pth to avoid conflicts between packages "Rename easy-install.pth to NAME.pth to avoid conflicts between packages