apteryx pushed a commit to branch cu/farewell-to-pythonpath in repository guix.
commit 8f61dd0e041b0dc0a8fcc1376d68134bdd8f7c02 Author: Maxim Cournoyer <[email protected]> AuthorDate: Wed Jan 27 17:30:11 2021 -0500 gnu: redshift: Wrap with GUIX_PYTHONPATH. * gnu/packages/xdisorg.scm (redshift): Streamline wrap phase and Wrap with GUIX_PYTHONPATH. --- gnu/packages/xdisorg.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 1a6ced8..e65247a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2020 James Smith <[email protected]> ;;; Copyright © 2020 B. Wilson <[email protected]> ;;; Copyright © 2020 Zheng Junjie <[email protected]> +;;; Copyright © 2021 Maxim Cournoyer <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1244,15 +1245,12 @@ the X.Org X Server version 1.7 and later (X11R7.5 or later).") (add-after 'split-outputs 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((gtk (assoc-ref outputs "gtk")) - (python-version - (@ (guix build python-build-system) python-version)) - (python (assoc-ref inputs "python")) - (sitedir (string-append gtk "/lib/python" - (python-version python) - "/site-packages"))) + (site-packages (@ (guix build python-build-system) + site-packages)) + (site (site-packages inputs outputs))) (wrap-program (string-append gtk "/bin/redshift-gtk") - `("PYTHONPATH" ":" prefix - (,(string-append sitedir ":" (getenv "PYTHONPATH")))) + `("GUIX_PYTHONPATH" ":" prefix + (,(string-append site ":" (getenv "GUIX_PYTHONPATH")))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))) #t)))))) (outputs '("out" "gtk"))
