TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: python: Fix build phases ordering.

Browse source 
The wrap phase was happening before the installed site location was added to
GUIX_PYTHONPATH, causing wrapped commands to not find their own Python
libraries.

* guix/build/python-build-system.scm (%standard-phases): Explicit the
sequential ordering of phases using add-after directives, so that the wrap
phase occurs after the add-install-to-pythonpath and add-install-to-path
phases.
This commit is contained in:
Maxim Cournoyer 2021-02-03 16:47:10 -05:00
parent e740cc6140
commit 157b302011
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
guix/build/python-build-system.scm
View file

@ -302,10 +302,11 @@ (define %standard-phases
(replace 'build build)
(delete 'check) ;moved after the install phase
(replace 'install install)
(add-after 'install 'check check)
(add-after 'install 'wrap wrap)
(add-before 'check 'add-install-to-pythonpath add-install-to-pythonpath)
(add-before 'check 'add-install-to-path add-install-to-path)
(add-after 'install 'add-install-to-pythonpath add-install-to-pythonpath)
(add-after 'add-install-to-pythonpath 'add-install-to-path
add-install-to-path)
(add-after 'add-install-to-path 'wrap wrap)
(add-after 'wrap 'check check)
(add-after 'check 'sanity-check sanity-check)
(add-before 'strip 'rename-pth-file rename-pth-file)))