movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-09 03:55:44 +03:00
Code Activity

matplotlib: fix pkgconfig situation

Browse source 
We need pkgs.pkgconfig, and not pythonPackages.pkgconfig.
This commit is contained in:
Frederik Rietdijk 2019-02-14 20:38:26 +01:00
parent d40bd10e68
commit 4256099a33
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/python-modules/matplotlib/2.nix
View file

@ -34,13 +34,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 ]

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

@ -3058,6 +3058,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 { };