[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: python-numpy: Give sh store location instead of setting $SHE
From: |
Thomas Danckaert |
Subject: |
01/01: gnu: python-numpy: Give sh store location instead of setting $SHELL. |
Date: |
Wed, 4 Oct 2017 08:10:03 -0400 (EDT) |
thomasd pushed a commit to branch master
in repository guix.
commit 1033cdbb0c27a75b77a05a97fbbe776060d5c6e7
Author: Thomas Danckaert <address@hidden>
Date: Sun Oct 1 14:32:04 2017 +0200
gnu: python-numpy: Give sh store location instead of setting $SHELL.
* gnu/packages/python.scm (python-numpy): [arguments] Don't set $SHELL in
the
environment, but embed the store location of bash-minimal as a default
shell. Otherwise, we have to set $SHELL for every package which uses
numpy's distutils.
---
gnu/packages/python.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c0173c5..bf451ab 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3742,8 +3742,6 @@ between language specification and implementation
aspects.")
(modify-phases %standard-phases
(add-before 'build 'set-environment-variables
(lambda* (#:key inputs #:allow-other-keys)
- ;; numpy's distutils uses $SHELL to run external commands.
- (setenv "SHELL" "bash")
(call-with-output-file "site.cfg"
(lambda (port)
(format port
@@ -3762,6 +3760,11 @@ include_dirs = ~a/include
(assoc-ref inputs "openblas")
(assoc-ref inputs "lapack")
(assoc-ref inputs "lapack"))))
+ ;; Make /gnu/store/...-bash-.../bin/sh the default shell, instead of
+ ;; /bin/sh.
+ (substitute* "numpy/distutils/exec_command.py"
+ (("(os.environ.get\\('SHELL', ')(/bin/sh'\\))" match match-start
match-end)
+ (string-append match-start (assoc-ref inputs "bash") match-end)))
;; Use "gcc" executable, not "cc".
(substitute* "numpy/distutils/system_info.py"
(("c = distutils\\.ccompiler\\.new_compiler\\(\\)")