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

python{2,3}Packages.matplotlib: use lib.generators.toINI to generate setup.cfg

This commit is contained in:
Dmitry Kalinkin 2021-04-10 05:08:13 -04:00 committed by github-actions[bot]
parent 30b7492d9b
commit 72cb029367
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/python-modules/matplotlib/2.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache
{ lib, stdenv, fetchPypi, writeText, python, buildPythonPackage, pycairo, backports_functools_lru_cache
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
, fetchpatch
@ -54,7 +54,13 @@ buildPythonPackage rec {
++ lib.optionals enableQt [ pyqt4 ]
++ lib.optionals python.isPy2 [ functools32 subprocess32 ];
setup_cfg = ./setup.cfg;
passthru.config = {
directories = { basedirlist = "."; };
libs = {
system_freetype = true;
};
};
setup_cfg = writeText "setup.cfg" (lib.generators.toINI {} passthru.config);
preBuild = ''
cp "$setup_cfg" ./setup.cfg
'';

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache
{ lib, stdenv, fetchPypi, writeText, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection
, certifi, pillow
@ -45,7 +45,16 @@ buildPythonPackage rec {
++ lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ lib.optionals enableQt [ pyqt5 ];
setup_cfg = if stdenv.isDarwin then ./setup-darwin.cfg else ./setup.cfg;
passthru.config = {
directories = { basedirlist = "."; };
libs = {
system_freetype = true;
} // lib.optionalAttrs stdenv.isDarwin {
# LTO not working in darwin stdenv, see #19312
enable_lto = false;
};
};
setup_cfg = writeText "setup.cfg" (lib.generators.toINI {} passthru.config);
preBuild = ''
cp "$setup_cfg" ./setup.cfg
'';

7
pkgs/development/python-modules/matplotlib/setup-darwin.cfg
View File

@ -1,7 +0,0 @@
[directories]
basedirlist = .
[libs]
system_freetype = true
# LTO not working in darwin stdenv, see #19312
enable_lto = false

5
pkgs/development/python-modules/matplotlib/setup.cfg
View File

@ -1,5 +0,0 @@
[directories]
basedirlist = .
[libs]
system_freetype = true