95/163: gnu: rapid-photo-downloader: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit b9048cd3a1c507bd7743a411e2c505b8c3bc6698
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 23:12:43 2021 -0500

    gnu: rapid-photo-downloader: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/photo.scm (rapid-photo-downloader)[phases]: Remove trailing 
#t.
    {wrap}: Wrap with the new Guix PYTHONPATH.
---
 gnu/packages/photo.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 5402826..89fd900 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2020 Sebastian Schott <sschott@mailbox.org>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -145,8 +146,7 @@
                (("pymedia_library_file = 'libmediainfo.so.0'")
                 (string-append "pymedia_library_file = '"
                                (assoc-ref %build-inputs "libmediainfo")
-                               "/lib/libmediainfo.so.0'")))
-             #t))
+                               "/lib/libmediainfo.so.0'")))))
          (add-after 'install 'wrap
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((out               (assoc-ref outputs "out"))
@@ -156,18 +156,17 @@
                                               "/bin"))
                                        ":"))
                    (gi-typelib-path   (getenv "GI_TYPELIB_PATH"))
-                   (python-path       (getenv "PYTHONPATH")))
+                   (pythonpath        (guix-pythonpath inputs)))
                (for-each
                 (lambda (program)
                   (wrap-program program
                     `("PATH" ":" prefix (,path))
                     `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
-                    `("PYTHONPATH"             ":" prefix (,python-path))))
+                    `(,pythonpath ":" prefix (,(getenv pythonpath)))))
                 (map (lambda (name)
                        (string-append out "/bin/" name))
                      '("analyze-pv-structure"
-                       "rapid-photo-downloader"))))
-             #t)))))
+                       "rapid-photo-downloader")))))))))
     (home-page "https://www.damonlynch.net/rapid/";)
     (synopsis "Import photos and videos from cameras, phones and memory cards")
     (description "Import photos and videos from cameras, phones and memory