aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2018-12-16 22:52:52 +0200
committerEfraim Flashner <efraim@flashner.co.il>2018-12-17 12:08:05 +0200
commit4ae16f9c4e9233bba2d8fcf22db37797fe77695b (patch)
treeb35cf9c58eb8bb2325c966cef5c500297456b91b
parent2f3977b9a7619e909828fbc4030229fe4195b741 (diff)
downloadguix-4ae16f9c4e9233bba2d8fcf22db37797fe77695b.tar
guix-4ae16f9c4e9233bba2d8fcf22db37797fe77695b.tar.gz
gnu: avogadro: Don't hardcode python version.
* gnu/packages/chemistry.scm (avogadro)[arguments]: Replace hardcoded python version with parametrized one.
-rw-r--r--gnu/packages/chemistry.scm18
1 files changed, 14 insertions, 4 deletions
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 03120aaeee..e682975b36 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
+;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,6 +20,7 @@
(define-module (gnu packages chemistry)
#:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download)
#:use-module (gnu packages)
@@ -55,7 +57,7 @@
"avogadro-boost148.patch"))))
(build-system cmake-build-system)
(arguments
- '(#:tests? #f
+ `(#:tests? #f
#:configure-flags
(list "-DENABLE_GLSL=ON"
(string-append "-DPYTHON_LIBRARIES="
@@ -63,7 +65,9 @@
"/lib")
(string-append "-DPYTHON_INCLUDE_DIRS="
(assoc-ref %build-inputs "python")
- "/include/python2.7"))
+ "/include/python"
+ ,(version-major+minor
+ (package-version python))))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-python-lib-path
@@ -76,7 +80,10 @@
(("^.*OUTPUT_VARIABLE.*")
(string-append "set(PYTHON_LIB_PATH \""
(assoc-ref outputs "out")
- "/lib/python2.7/site-packages\")")))
+ "/lib/python"
+ ,(version-major+minor
+ (package-version python))
+ "/site-packages\")")))
#t))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -85,7 +92,10 @@
(setenv "PYTHONPATH"
(string-append
(assoc-ref outputs "out")
- "/lib/python2.7/site-packages:"
+ "/lib/python"
+ ,(version-major+minor
+ (package-version python))
+ "/site-packages:"
(getenv "PYTHONPATH")))
(wrap-program (string-append out "/bin/avogadro")
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))))