diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-27 17:30:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-02-01 11:54:00 -0500 |
| commit | b6632b23d7de7d39a8b65d72cd3f55ddb31ef361 (patch) | |
| tree | f8a5a82ffbeee0989380caf021047e733effef6f | |
| parent | df76386b1213610ec8caa0fb67e621693912b557 (diff) | |
| download | guix-patches-b6632b23d7de7d39a8b65d72cd3f55ddb31ef361.tar guix-patches-b6632b23d7de7d39a8b65d72cd3f55ddb31ef361.tar.gz | |
gnu: redshift: Wrap with GUIX_PYTHONPATH.
* gnu/packages/xdisorg.scm (redshift): Streamline wrap phase and Wrap with
GUIX_PYTHONPATH.
| -rw-r--r-- | gnu/packages/xdisorg.scm | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 70c1c0989d..0fec969b2b 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2020 James Smith <jsubuntuxp@disroot.org> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2020 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1248,15 +1249,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")) |