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

Revert "python.pkgs.matplotlib: use pkgs.pkgconfig"

Browse Source 
This reverts commit c78f98db56.
This commit is contained in:
Frederik Rietdijk
2019-02-17 14:40:51 +01:00
parent 46f2b49b44
commit 0c3197ec08
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python-modules/matplotlib/default.nix
+1 -3
View File
@@ -35,15 +35,13 @@ 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 mock pytz ] libpng pkgconfig 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 ]
pkgs/top-level/python-packages.nix
-1
View File
@@ -3058,7 +3058,6 @@ 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 { };