htgoebel pushed a commit to branch wip-python-build-system
in repository guix.

commit 00dee16e68bb45c2184a98e8ba04337664d12110
Author: Hartmut Goebel <h.goe...@crazy-compilers.com>
Date:   Sun Oct 9 16:05:24 2016 +0200

    gnu: python-scipy: Fix build.
    
    * gnu/packages/python.scm (python-scipy) Use add-installed-pythonpath.  Add
      dummy newlines character to string to make emacs happy.
---
 gnu/packages/python.scm |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index b717da1..93baf06 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3488,7 +3488,9 @@ functions.")
 libraries = openblas
 library_dirs = ~a/lib
 include_dirs = ~a/include
-[atlas]
+
+# backslash-n to make emacs happy
+\n[atlas]
 library_dirs = ~a/lib
 atlas_libs = openblas
 "
@@ -3498,11 +3500,14 @@ atlas_libs = openblas
           #t)
         (alist-cons-after
          'install 'install-doc
-         (lambda* (#:key outputs #:allow-other-keys)
+         (lambda* (#:key inputs outputs #:allow-other-keys)
            (let* ((data (string-append (assoc-ref outputs "doc") "/share"))
                   (doc (string-append data "/doc/" ,name "-" ,version))
                   (html (string-append doc "/html"))
                   (pyver ,(string-append "PYVER=")))
+             ;; Make installed package available for building the
+             ;; documentation
+             (add-installed-pythonpath outputs inputs)
              (with-directory-excursion "doc"
                ;; Fix generation of images for mathematical expressions.
                (substitute* (find-files "source" "conf\\.py")

Reply via email to