109/163: gnu: d-feet: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit e8c16b73d26e902bc8e25dc81a5f5c0039dfbede
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jan 24 00:02:23 2021 -0500

    gnu: d-feet: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/gnome.scm (d-feet): Delete trailing #t.
    [arguments]: Import and use the (guix build python-build-system) module.
    [phases]{wrap-program}: Wrap with the new Guix PYTHONPATH.
---
 gnu/packages/gnome.scm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index eb77148..a5fba0d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6680,7 +6680,12 @@ principles are simplicity and standards compliance.")
                 "1m8lwiwl5jhi0x7y6x5zmd3hjplgvdjrb8a8jg74rvkygslj1p7f"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     '(#:out-of-source? #f ; tests need to run in the source directory.
+     '(#:imported-modules ,(cons '(guix build python-build-system)
+                                 %glib-or-gtk-build-system-modules)
+       #:modules ((guix build glib-or-gtk-build-system)
+                  ((guix build python-build-system) #:select (guix-pythonpath))
+                  (guix build utils))
+       #:out-of-source? #f ; tests need to run in the source directory.
        #:phases
        (modify-phases %standard-phases
          (add-before
@@ -6694,17 +6699,16 @@ principles are simplicity and standards compliance.")
             ;; tests.py and window.py don't meet E402:
             ;;   E402 module level import not at top of file
             (substitute* "src/tests/Makefile"
-              (("--ignore=E123") "--ignore=E123,E402"))
-            #t))
+              (("--ignore=E123") "--ignore=E123,E402"))))
          (add-after
           'install 'wrap-program
-          (lambda* (#:key outputs #:allow-other-keys)
+          (lambda* (#:key inputs outputs #:allow-other-keys)
             (let ((prog (string-append (assoc-ref outputs "out")
-                                       "/bin/d-feet")))
+                                       "/bin/d-feet"))
+                  (pythonpath (guix-pythonpath inputs)))
               (wrap-program prog
-                `("PYTHONPATH" = (,(getenv "PYTHONPATH")))
-                `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
-              #t))))))
+                `(,pythonpath = (,(getenv pythonpath)))
+                `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
     (native-inputs
      `(("intltool" ,intltool)
        ("itstool" ,itstool)