guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

122/131: gnu: avogadro: Wrap with GUIX_PYTHONPATH.


From: guix-commits
Subject: 122/131: gnu: avogadro: Wrap with GUIX_PYTHONPATH.
Date: Fri, 29 Jan 2021 09:22:20 -0500 (EST)

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

commit b4731bff4e5adeecd83bfd4bcaf613759381dc1e
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Jan 27 21:21:59 2021 -0500

    gnu: avogadro: Wrap with GUIX_PYTHONPATH.
    
    * gnu/packages/chemistry.scm (avogadro)
    [phases]: Delete trailing #t.
    {wrap-program}: Replace PYTHONPATH with GUIX_PYTHONPATH.
---
 gnu/packages/chemistry.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 0fef6a7..4aa39a5 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -94,13 +94,12 @@
                                "/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"
+               (setenv "GUIX_PYTHONPATH"
                        (string-append
                         (assoc-ref outputs "out")
                         "/lib/python"
@@ -109,8 +108,8 @@
                         "/site-packages:"
                         (getenv "GUIX_PYTHONPATH")))
                (wrap-program (string-append out "/bin/avogadro")
-                 `("GUIX_PYTHONPATH" ":" prefix (,(getenv 
"GUIX_PYTHONPATH")))))
-             #t)))))
+                 `("GUIX_PYTHONPATH" ":" prefix
+                   (,(getenv "GUIX_PYTHONPATH"))))))))))
     (native-inputs
      `(("doxygen" ,doxygen)
        ("pkg-config" ,pkg-config)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]