gnu: python-matplotlib: Fix build.

* gnu/packages/python.scm (python-matplotlib, python2-matplotlib): Correct
  inputs. [install-doc] set PYTHONPATH prior to building docs.
This commit is contained in:
Hartmut Goebel 2016-10-09 13:19:50 +02:00
parent 2efabc5589
commit ca33a3ad97
No known key found for this signature in database
GPG key ID: 634A8DFFD3F631DF

View file

@ -3385,6 +3385,11 @@ (define-public python-matplotlib
("python-pygobject" ,python-pygobject)
("gobject-introspection" ,gobject-introspection)
("python-tkinter" ,python "tk")
("python-dateutil" ,python-dateutil-2)
("python-numpy" ,python-numpy-bootstrap)
("python-pillow" ,python-pillow)
("python-pytz" ,python-pytz)
("python-six" ,python-six)
;; The 'gtk+' package (and 'gdk-pixbuf', 'atk' and 'pango' propagated
;; from 'gtk+') provides the required 'typelib' files used by
;; 'gobject-introspection'. The location of these files is set with the
@ -3401,20 +3406,11 @@ (define-public python-matplotlib
("python-pycairo" ,python-pycairo)
("python-cairocffi" ,python-cairocffi)))
(inputs
`(("python-dateutil" ,python-dateutil-2)
("python-six" ,python-six)
("python-pytz" ,python-pytz)
("python-numpy" ,python-numpy-bootstrap)
("python-sphinx" ,python-sphinx)
("python-numpydoc" ,python-numpydoc)
("python-nose" ,python-nose)
("python-mock" ,python-mock)
("libpng" ,libpng)
`(("libpng" ,libpng)
("imagemagick" ,imagemagick)
("freetype" ,freetype)
("cairo" ,cairo)
("glib" ,glib)
("python-pillow" ,python-pillow)
;; FIXME: Add backends when available.
;("python-wxpython" ,python-wxpython)
;("python-pyqt" ,python-pyqt)
@ -3422,6 +3418,10 @@ (define-public python-matplotlib
("tk" ,tk)))
(native-inputs
`(("pkg-config" ,pkg-config)
("python-sphinx" ,python-sphinx)
("python-numpydoc" ,python-numpydoc)
("python-nose" ,python-nose)
("python-mock" ,python-mock)
("texlive" ,texlive)
("texinfo" ,texinfo)))
(arguments
@ -3446,11 +3446,14 @@ (define-public python-matplotlib
(assoc-ref inputs "tk"))))))
(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))
(info (string-append data "/info"))
(html (string-append doc "/html")))
;; Make installed package available for building the
;; documentation
(add-installed-pythonpath inputs outputs)
(with-directory-excursion "doc"
;; Produce pdf in 'A4' format.
(substitute* (find-files "." "conf\\.py")