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

gnu: redshift: Wrap with GUIX_PYTHONPATH.

Browse source 
* gnu/packages/xdisorg.scm (redshift): Streamline wrap phase and Wrap with
GUIX_PYTHONPATH.
This commit is contained in:
Maxim Cournoyer 2021-01-27 17:30:11 -05:00
parent df76386b12
commit b6632b23d7
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/xdisorg.scm
View file

@ -43,6 +43,7 @@
;;; Copyright © 2020 James Smith <jsubuntuxp@disroot.org> ;;; Copyright © 2020 James Smith <jsubuntuxp@disroot.org>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2020 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1248,15 +1249,12 @@ (define-public redshift
(add-after 'split-outputs 'wrap (add-after 'split-outputs 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((gtk (assoc-ref outputs "gtk")) (let* ((gtk (assoc-ref outputs "gtk"))
(python-version (site-packages (@ (guix build python-build-system)
(@ (guix build python-build-system) python-version)) site-packages))
(python (assoc-ref inputs "python")) (site (site-packages inputs outputs)))
(sitedir (string-append gtk "/lib/python"
(python-version python)
"/site-packages")))
(wrap-program (string-append gtk "/bin/redshift-gtk") (wrap-program (string-append gtk "/bin/redshift-gtk")
`("PYTHONPATH" ":" prefix `("GUIX_PYTHONPATH" ":" prefix
(,(string-append sitedir ":" (getenv "PYTHONPATH")))) (,(string-append site ":" (getenv "GUIX_PYTHONPATH"))))
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
#t)))))) #t))))))
(outputs '("out" "gtk")) (outputs '("out" "gtk"))