29/163: gnu: redshift: Do not set PYTHONPATH.

[guix-commits]

apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.

commit 42bab30c34fe8a04f947e3b0ca7e089593b60501
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 16:55:50 2021 -0500

    gnu: redshift: Do not set PYTHONPATH.
    
    * gnu/packages/xdisorg.scm (redshift): Remove trailing #t.
    [phases]{wrap}: Use the new Guix PYTHONPATH.
---
 gnu/packages/xdisorg.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 1a6ced8..14aabcc 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1215,6 +1215,9 @@ the X.Org X Server version 1.7 and later (X11R7.5 or 
later).")
     (arguments
      `(#:imported-modules (,@%gnu-build-system-modules
                            (guix build python-build-system))
+       #:modules ((guix build gnu-build-system)
+                  ((guix build python-build-system) #:select (guix-pythonpath))
+                  (guix build utils))
        #:phases
        (modify-phases %standard-phases
          (add-after 'install 'split-outputs
@@ -1239,8 +1242,7 @@ the X.Org X Server version 1.7 and later (X11R7.5 or 
later).")
                               (string-append out "/share/" dir)
                               (string-append gtk "/share/" dir))
                              (delete-file-recursively dir))
-                           '("appdata" "icons")))
-               #t)))
+                           '("appdata" "icons"))))))
          (add-after 'split-outputs 'wrap
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((gtk (assoc-ref outputs "gtk"))
@@ -1249,12 +1251,13 @@ the X.Org X Server version 1.7 and later (X11R7.5 or 
later).")
                     (python (assoc-ref inputs "python"))
                     (sitedir (string-append gtk "/lib/python"
                                             (python-version python)
-                                            "/site-packages")))
+                                            "/site-packages"))
+                    (pythonpath (guix-pythonpath inputs)))
                (wrap-program (string-append gtk "/bin/redshift-gtk")
-                 `("PYTHONPATH" ":" prefix
-                   (,(string-append sitedir ":" (getenv "PYTHONPATH"))))
-                 `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
-               #t))))))
+                 `(,pythonpath ":" prefix
+                               (,(string-append sitedir ":" (getenv 
pythonpath))))
+                 `("GI_TYPELIB_PATH" ":" prefix
+                   (,(getenv "GI_TYPELIB_PATH"))))))))))
     (outputs '("out" "gtk"))
     (native-inputs
      `(("pkg-config" ,pkg-config)