46/163: gnu: avogadro: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit 567b73b598b1f6e0b2211a7e64e222618be66763
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 23:27:22 2021 -0500

    gnu: avogadro: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/chemistry.scm (avogadro)[phases]{wrap-program}: Wrap with the
    new Guix PYTHONPATH.  Delete trailing #t.
---
 gnu/packages/chemistry.scm | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index ddbf5ca..06d8bfa 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -68,7 +68,12 @@
                         "avogadro-boost148.patch"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f
+     `(#:imported-modules ,(cons '(guix build python-build-system)
+                                 %cmake-build-system-modules)
+       #:modules ((guix build cmake-build-system)
+                  ((guix build python-build-system) #:select (guix-pythonpath))
+                  (guix build utils))
+       #:tests? #f
        #:configure-flags
        (list "-DENABLE_GLSL=ON"
              (string-append "-DPYTHON_LIBRARIES="
@@ -94,23 +99,14 @@
                                "/lib/python"
                                ,(version-major+minor
                                   (package-version python))
-                               "/site-packages\")")))
-             #t))
+                               "/site-packages\")")))))
          (add-after 'install 'wrap-program
            (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; Make sure 'avogadro' runs with the correct PYTHONPATH.
-             (let* ((out (assoc-ref outputs "out")))
-               (setenv "PYTHONPATH"
-                       (string-append
-                        (assoc-ref outputs "out")
-                        "/lib/python"
-                        ,(version-major+minor
-                           (package-version python))
-                        "/site-packages:"
-                        (getenv "PYTHONPATH")))
+             (let ((out (assoc-ref outputs "out"))
+                   (pythonpath (guix-pythonpath inputs)))
                (wrap-program (string-append out "/bin/avogadro")
-                 `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))))
-             #t)))))
+                 `(,pythonpath ":" prefix (,(getenv pythonpath))))))))))
     (native-inputs
      `(("doxygen" ,doxygen)
        ("pkg-config" ,pkg-config)))