101/163: gnu: presentty: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit 781dc340b197dad3a5b6a3fde6200fb8457da384
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 23:42:44 2021 -0500

    gnu: presentty: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/presentation.scm (presentty)
    [phases]{wrap}: Wrap with the new Guix PYTHONPATH.  Remove trailing #t.
---
 gnu/packages/presentation.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/presentation.scm b/gnu/packages/presentation.scm
index 0ad407d..90d6316 100644
--- a/gnu/packages/presentation.scm
+++ b/gnu/packages/presentation.scm
@@ -1,4 +1,5 @@
 ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -55,21 +56,16 @@
            (lambda* (#:key python inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin/"))
-                    (python (assoc-ref inputs "python")))
+                    (python (assoc-ref inputs "python"))
+                    (pythonpath (guix-pythonpath inputs)))
                (for-each
                  (lambda (program)
                    (wrap-program (string-append bin program)
                      `("PATH" ":" prefix (,(dirname (which "cowsay"))
                                           ,(dirname (which "figlet"))
                                           ,(dirname (which "jp2a"))))
-                     `("PYTHONPATH" prefix
-                       ,(cons (string-append out "/lib/python"
-                                             (python-version python)
-                                             "/site-packages")
-                              (search-path-as-string->list
-                                (or (getenv "PYTHONPATH") ""))))))
-                 '("presentty" "presentty-console")))
-             #t)))))
+                     `(,pythonpath ":" prefix (,(getenv pythonpath)))))
+                 '("presentty" "presentty-console"))))))))
     (inputs
      `(("cowsay" ,cowsay)
        ("figlet" ,figlet)