diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-14 20:38:26 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-17 14:40:51 +0100 |
commit | 4256099a3311a0ac0e700317ec2577cf7106dadc (patch) | |
tree | 05644fd99d7fb404e82f8bca3c33889dc0bc42bf /pkgs/development/python-modules/matplotlib | |
parent | d40bd10e68f256d8ad283e223d2d23c1ea69dfad (diff) |
matplotlib: fix pkgconfig situation
We need pkgs.pkgconfig, and not pythonPackages.pkgconfig.
Diffstat (limited to 'pkgs/development/python-modules/matplotlib')
-rw-r--r-- | pkgs/development/python-modules/matplotlib/2.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/matplotlib/default.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index 6334d2e4f7939..fb433be8d9907 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -34,13 +34,15 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python which sphinx stdenv ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver - libpng pkgconfig mock pytz ] + libpng mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 718eb2de42525..d4c8e970c5012 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -35,13 +35,15 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python which sphinx stdenv ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver - libpng pkgconfig mock pytz ] + libpng mock pytz ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] |