34/163: gnu: pitivi: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit b4b339aa4b3a89ac3d6b0149f072415543834657
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 22:13:36 2021 -0500

    gnu: pitivi: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/video.scm (pitivi)
    [phases]{wrap-other-dependencies}: Wrap with the new Guix PYTHONPATH.  
Delete
    trailing #t.
---
 gnu/packages/video.scm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 824ea62..87a7fa6 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -47,6 +47,7 @@
 ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;; Copyright © 2020 Ivan Kozlov <kanichos@yandex.ru>
 ;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4044,22 +4045,27 @@ tools for styling them, including a built-in real-time 
video preview.")
        ("itstool" ,itstool)
        ("pkg-config" ,pkg-config)))
      (arguments
-      `(#:glib-or-gtk? #t
+      `(#:imported-modules ,(cons '(guix build python-build-system)
+                                  %meson-build-system-modules)
+        #:modules ((guix build meson-build-system)
+                   ((guix build python-build-system) #:select 
(guix-pythonpath))
+                   (guix build utils))
+        #:glib-or-gtk? #t
         #:phases
         (modify-phases %standard-phases
           (add-after 'glib-or-gtk-wrap 'wrap-other-dependencies
-            (lambda* (#:key outputs #:allow-other-keys)
+            (lambda* (#:key inputs outputs #:allow-other-keys)
               (let ((prog (string-append (assoc-ref outputs "out")
-                                         "/bin/pitivi")))
+                                         "/bin/pitivi"))
+                    (pythonpath (guix-pythonpath inputs)))
                 (wrap-program prog
-                  `("PYTHONPATH" = (,(getenv "PYTHONPATH")))
+                  `(,pythonpath = (,(getenv pythonpath)))
                   `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
                   ;; We've only added inputs for what Pitivi deems either
                   ;; necessary or optional.  Let the user's packages take
                   ;; precedence in case they have e.g. the full 
gst-plugins-bad.
                   `("GST_PLUGIN_SYSTEM_PATH" suffix
-                    (,(getenv "GST_PLUGIN_SYSTEM_PATH")))))
-                #t)))))
+                    (,(getenv "GST_PLUGIN_SYSTEM_PATH"))))))))))
      (home-page "http://www.pitivi.org";)
      (synopsis "Video editor based on GStreamer Editing Services")
      (description "Pitivi is a video editor built upon the GStreamer Editing