85/163: gnu: units: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit 66d0d63ee91b095ae1639cf746ed74e1cf418453
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 22:53:11 2021 -0500

    gnu: units: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/maths.scm (units)
    [phases]{wrap-units_cur}: Wrap with the new Guix PYTHONPATH.
---
 gnu/packages/maths.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4019c7e..866cf46 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -42,6 +42,7 @@
 ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -320,15 +321,19 @@ programming language.")
       ("python" ,python-wrapper)        ;for 'units_cur' script
       ("python-requests" ,python-requests)))
    (arguments
-    `(#:phases (modify-phases %standard-phases
+    `(#: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))
+      #:phases (modify-phases %standard-phases
                  (add-after 'install 'wrap-units_cur
-                   (lambda* (#:key outputs #:allow-other-keys)
+                   (lambda* (#:key inputs outputs #:allow-other-keys)
                      (let* ((out (assoc-ref outputs "out"))
-                            (bin (string-append out "/bin")))
+                            (bin (string-append out "/bin"))
+                            (pythonpath (guix-pythonpath inputs)))
                        (wrap-program (string-append bin "/units_cur")
-                         `("PYTHONPATH" ":" prefix
-                           ,(search-path-as-string->list (getenv 
"PYTHONPATH"))))
-                       #t))))))
+                         `(,pythonpath ":" prefix (,(getenv 
pythonpath))))))))))
    (synopsis "Conversion between thousands of scales")
    (description
     "GNU Units converts numeric quantities between units of measure.  It