80/163: gnu: gtk-doc: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit 1701d07eb97348594f2ea5c773304dd733d9264a
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 22:36:35 2021 -0500

    gnu: gtk-doc: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/gtk.scm (gtk-doc)[phases]: Delete trailing #t.
    [phases]{wrap-executables}: Wrap with the new Guix PYTHONPATH.
---
 gnu/packages/gtk.scm | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6a35e32..2cdff7c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1720,7 +1720,12 @@ information.")
                 "05apmwibkmn1icx05l8aw241lhymcx01zvk5i499cb150bijj7li"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:parallel-tests? #f
+     `(#:imported-modules ,(cons '(guix build python-build-system)
+                                 %gnu-build-system-modules)
+       #:modules ((guix build gnu-build-system)
+                  ((guix build python-build-system) #:select (guix-pythonpath))
+                  (guix build utils))
+       #:parallel-tests? #f
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-gtk-doc-scan
@@ -1735,8 +1740,7 @@ information.")
                (string-append (assoc-ref inputs "docbook-xsl")
                               "/xml/xsl/docbook-xsl-"
                               ,(package-version docbook-xsl)
-                              "/common/en.xml")))
-             #t))
+                              "/common/en.xml")))))
          (add-after 'patch-gtk-doc-scan 'patch-test-out
            (lambda _
              ;; sanity.sh counts the number of status lines.  Since our
@@ -1744,8 +1748,7 @@ information.")
              ;; generator metafont outputs a lot of extra lines, this
              ;; test would always fail.  Disable it for now.
              (substitute* "tests/Makefile.in"
-              (("empty.sh sanity.sh") "empty.sh"))
-             #t))
+              (("empty.sh sanity.sh") "empty.sh"))))
          (add-before 'configure 'fix-docbook
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "configure"
@@ -1757,18 +1760,18 @@ information.")
                ;; docbook-xsl catalog explicitly and get on with life.
                (("\"\\$XML_CATALOG_FILE\" \
 \"http://docbook.sourceforge.net/release/xsl/";)
-                (string-append (car (find-files (assoc-ref inputs 
"docbook-xsl")
-                                                "^catalog.xml$"))
-                               " 
\"http://docbook.sourceforge.net/release/xsl/";)))
-             #t))
+                (string-append
+                 (car (find-files (assoc-ref inputs "docbook-xsl")
+                                  "^catalog.xml$"))
+                 " \"http://docbook.sourceforge.net/release/xsl/";)))))
          (add-after 'install 'wrap-executables
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (pythonpath (guix-pythonpath inputs)))
                (for-each (lambda (prog)
                            (wrap-program prog
-                             `("PYTHONPATH" ":" prefix (,(getenv 
"PYTHONPATH")))))
-                         (find-files (string-append out "/bin")))
-               #t))))
+                             `(,pythonpath ":" prefix (,(getenv pythonpath)))))
+                         (find-files (string-append out "/bin")))))))
        #:configure-flags
        (list (string-append "--with-xml-catalog="
                             (assoc-ref %build-inputs "docbook-xml")