[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/09: gnu: avogadro: Don't hardcode python version.
From: |
guix-commits |
Subject: |
03/09: gnu: avogadro: Don't hardcode python version. |
Date: |
Mon, 17 Dec 2018 05:41:32 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 4ae16f9c4e9233bba2d8fcf22db37797fe77695b
Author: Efraim Flashner <address@hidden>
Date: Sun Dec 16 22:52:52 2018 +0200
gnu: avogadro: Don't hardcode python version.
* gnu/packages/chemistry.scm (avogadro)[arguments]: Replace hardcoded
python version with parametrized one.
---
gnu/packages/chemistry.scm | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 03120aa..e682975 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 <address@hidden>
;;; Copyright © 2018 Kei Kebreau <address@hidden>
+;;; Copyright © 2018 Efraim Flashner <address@hidden>
;;;
;;; 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")))))
- branch master updated (f8be766 -> 1e2ebf7), guix-commits, 2018/12/17
- 01/09: gnu: nmap: Don't hardcode python version., guix-commits, 2018/12/17
- 04/09: gnu: kicad: Don't hardcode version numbers., guix-commits, 2018/12/17
- 02/09: gnu: gess: Don't hardcode python version., guix-commits, 2018/12/17
- 05/09: gnu: z3: Declare source-file-name., guix-commits, 2018/12/17
- 03/09: gnu: avogadro: Don't hardcode python version.,
guix-commits <=
- 09/09: gnu: tree: Update to 1.8.0., guix-commits, 2018/12/17
- 08/09: gnu: elemental: Don't use unstable tarball., guix-commits, 2018/12/17
- 06/09: gnu: z3: Fix building on non-Intel machines., guix-commits, 2018/12/17
- 07/09: gnu: elemental: Fix indentation., guix-commits, 2018/12/17