public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python.pkgs.matplotlib: use pkgs.pkgconfig

Browse Source
This commit is contained in:
Robert Schütz 2019-01-18 01:20:41 +01:00 committed by Frederik Rietdijk
parent 25a3537244
commit c78f98db56
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/matplotlib/default.nix
View File

@ -35,13 +35,15 @@ buildPythonPackage rec {
XDG_RUNTIME_DIR = "/tmp"; XDG_RUNTIME_DIR = "/tmp";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ python which sphinx stdenv ] buildInputs = [ python which sphinx stdenv ]
++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional enableGhostscript ghostscript
++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
propagatedBuildInputs = propagatedBuildInputs =
[ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver [ 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 (pythonOlder "3.3") backports_functools_lru_cache
++ stdenv.lib.optional enableGtk2 pygtk ++ stdenv.lib.optional enableGtk2 pygtk
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]

1
pkgs/top-level/python-packages.nix
View File

@ -2997,6 +2997,7 @@ in {
in callPackage path { in callPackage path {
stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
inherit (pkgs) pkgconfig;
}; };
matrix-client = callPackage ../development/python-modules/matrix-client { }; matrix-client = callPackage ../development/python-modules/matrix-client { };