diff options
| author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2016-10-09 13:19:50 +0200 |
|---|---|---|
| committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2016-11-15 22:31:23 +0100 |
| commit | ca33a3ad970db4fa7ede5d977db576ae98e67406 (patch) | |
| tree | 3b5d02d4af60736fc47a3a66e62ef8f5a75248a4 /gnu | |
| parent | 2efabc5589dc641dce75702b99253a3fb40bb2eb (diff) | |
| download | patches-ca33a3ad970db4fa7ede5d977db576ae98e67406.tar patches-ca33a3ad970db4fa7ede5d977db576ae98e67406.tar.gz | |
gnu: python-matplotlib: Fix build.
* gnu/packages/python.scm (python-matplotlib, python2-matplotlib): Correct
inputs. [install-doc] set PYTHONPATH prior to building docs.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/python.scm | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 092378c1ba..0c5450bec4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3385,6 +3385,11 @@ transcendental functions).") ("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 @@ transcendental functions).") ("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 @@ transcendental functions).") ("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 @@ backend = TkAgg~%" (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") |