[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
111/131: gnu: redshift: Wrap with GUIX_PYTHONPATH.
From: |
guix-commits |
Subject: |
111/131: gnu: redshift: Wrap with GUIX_PYTHONPATH. |
Date: |
Fri, 29 Jan 2021 09:22:17 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit 8f61dd0e041b0dc0a8fcc1376d68134bdd8f7c02
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
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 <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.
;;;
@@ -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"))
- 82/131: gnu: python-flake8-polyfill: Do not set PYTHONPATH., (continued)
- 82/131: gnu: python-flake8-polyfill: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 96/131: gnu: python-apispec: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 73/131: gnu: python-click: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 78/131: gnu: python-pygithub: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 83/131: gnu: python-msgpack: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 56/131: gnu: python-fenics-ufl: Do not alter PYTHONPATH., guix-commits, 2021/01/29
- 89/131: gnu: python-odfpy: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 99/131: gnu: python-aiohttp: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 102/131: gnu: python-cfn-lint: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 103/131: gnu: python-jsonpickle: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 111/131: gnu: redshift: Wrap with GUIX_PYTHONPATH.,
guix-commits <=
- 129/131: gnu: mpd: Update comment., guix-commits, 2021/01/29
- 58/131: gnu: python-fenics-ffc: Do not alter PYTHONPATH., guix-commits, 2021/01/29
- 61/131: gnu: python-pure-protobuf: Do not alter PYTHONPATH., guix-commits, 2021/01/29
- 85/131: gnu: python-tblib: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 81/131: gnu: python2-backports-shutil-get-terminal-size: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 88/131: gnu: python-binwalk: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 98/131: gnu: python2-send2trash: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 100/131: gnu: python-asgiref: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 120/131: gnu: hplip: Adjust to use GUIX_PYTHONPATH., guix-commits, 2021/01/29
- 114/131: gnu: gpodder: Do not alter PYTHONPATH., guix-commits, 2021/01/29