aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-01-27 21:21:59 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-02-01 11:54:02 -0500
commit3123c281a53c067dd77955f3c54eaff462ccce7c (patch)
tree051adc9bf1f289da9f13e0bc93498cfe4065671a /gnu
parent8454438e0532aa026534510a0f6677552fc0e810 (diff)
downloadguix-3123c281a53c067dd77955f3c54eaff462ccce7c.tar.gz
guix-3123c281a53c067dd77955f3c54eaff462ccce7c.zip
gnu: avogadro: Wrap with GUIX_PYTHONPATH.
* gnu/packages/chemistry.scm (avogadro) [phases]: Delete trailing #t. {wrap-program}: Replace PYTHONPATH with GUIX_PYTHONPATH.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/chemistry.scm9
1 files changed, 4 insertions, 5 deletions
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)))