110/163: gnu: gedit: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit 54472bab202e9d14e0d4b353370122eb145befea
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jan 24 00:04:38 2021 -0500

    gnu: gedit: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/gnome.scm (gedit): 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, 11 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a5fba0d..c1f8528 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7134,7 +7134,12 @@ javascript engine and the GObject introspection 
framework.")
                 "1inm50sdfw63by1lf4f1swb59mpyxlly0g5rdg99j5l3357fzygb"))))
     (build-system meson-build-system)
     (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
        #:configure-flags
        ;; Otherwise, the RUNPATH will lack the final path component.
        (list (string-append "-Dc_link_args=-Wl,-rpath="
@@ -7149,8 +7154,7 @@ javascript engine and the GObject introspection 
framework.")
            ;; Don't create 'icon-theme.cache'.
            (lambda _
              (substitute* "build-aux/meson/post_install.py"
-               (("gtk-update-icon-cache") (which "true")))
-             #t))
+               (("gtk-update-icon-cache") (which "true")))))
          (add-after 'unpack 'patch-libgd-fetch
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((libgd (assoc-ref inputs "libgd")))
@@ -7158,22 +7162,20 @@ javascript engine and the GObject introspection 
framework.")
                ;; native input to this package.
                (substitute* "meson.build"
                  ((".*git.*") ""))
-               (copy-recursively libgd "subprojects/libgd")
-               #t)))
+               (copy-recursively libgd "subprojects/libgd"))))
          (add-after 'install 'wrap-gedit
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((out               (assoc-ref outputs "out"))
                    (gtksourceview     (assoc-ref inputs "gtksourceview"))
                    (gi-typelib-path   (getenv "GI_TYPELIB_PATH"))
-                   (python-path       (getenv "PYTHONPATH")))
+                   (pythonpath        (guix-pythonpath inputs)))
                (wrap-program (string-append out "/bin/gedit")
                  ;; For plugins.
                  `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
-                 `("PYTHONPATH" ":" prefix (,python-path))
+                 `(,pythonpath ":" prefix (,(getenv pythonpath)))
                  ;; For language-specs.
                  `("XDG_DATA_DIRS" ":" prefix (,(string-append gtksourceview
-                                                               "/share")))))
-             #t)))))
+                                                               
"/share"))))))))))
     (propagated-inputs
      `(("dconf" ,dconf)))
     (native-inputs