From 157b3020114c985068d8da49c30306d169e556d2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 3 Feb 2021 16:47:10 -0500 Subject: [PATCH] build: python: Fix build phases ordering. 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. --- guix/build/python-build-system.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 1fc97d1398..8ade1d5911 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -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)))