83/163: gnu: gimp: Use the new Guix PYTHONPATH.

[guix-commits]

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

commit 6ce85c8947330101d3c2a96094e7cd53a5105350
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 22:48:32 2021 -0500

    gnu: gimp: Use the new Guix PYTHONPATH.
    
    * gnu/packages/gimp.scm (gimp)
    [phases]{install-sitecustomize.py}: Use the new Guix PYTHONPATH.
---
 gnu/packages/gimp.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 4d229a1..ad19284 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2018 Thorsten Wilms <t_w_@freenet.de>
 ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -278,7 +279,12 @@ buffers.")
     (outputs '("out"
                "doc"))                            ; 9 MiB of gtk-doc HTML
     (arguments
-     '(#:configure-flags
+     '(#: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))
+       #:configure-flags
        (list (string-append "--with-html-dir="
                             (assoc-ref %outputs "doc")
                             "/share/gtk-doc/html")
@@ -299,8 +305,8 @@ buffers.")
          (add-after 'install 'install-sitecustomize.py
            ;; Install 'sitecustomize.py' into gimp's python directory to
            ;; add pygobject and pygtk to pygimp's search path.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((pythonpath (getenv "PYTHONPATH"))
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((pythonpath (guix-pythonpath inputs))
                     (out        (assoc-ref outputs "out"))
                     (sitecustomize.py
                      (string-append
@@ -308,7 +314,8 @@ buffers.")
                (call-with-output-file sitecustomize.py
                  (lambda (port)
                    (format port "import site~%")
-                   (format port "for dir in '~a'.split(':'):~%" pythonpath)
+                   (format port "for dir in '~a'.split(':'):~%"
+                           (getenv pythonpath))
                    (format port "    site.addsitedir(dir)~%")))))))))
     (inputs
      `(("babl" ,babl)