From 3123c281a53c067dd77955f3c54eaff462ccce7c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 27 Jan 2021 21:21:59 -0500 Subject: 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(-) (limited to 'gnu') diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index 0fef6a7ff3..4aa39a567d 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))) -- cgit v1.2.3