python{2,3}Packages.matplotlib: use lib.generators.toINI to generate setup.cfg
This commit is contained in:
parent
30b7492d9b
commit
72cb029367
|
@ -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
|
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
|
||||||
, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
|
, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
|
@ -54,7 +54,13 @@ buildPythonPackage rec {
|
||||||
++ lib.optionals enableQt [ pyqt4 ]
|
++ lib.optionals enableQt [ pyqt4 ]
|
||||||
++ lib.optionals python.isPy2 [ functools32 subprocess32 ];
|
++ 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 = ''
|
preBuild = ''
|
||||||
cp "$setup_cfg" ./setup.cfg
|
cp "$setup_cfg" ./setup.cfg
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -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
|
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
|
||||||
, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection
|
, freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection
|
||||||
, certifi, pillow
|
, certifi, pillow
|
||||||
|
@ -45,7 +45,16 @@ buildPythonPackage rec {
|
||||||
++ lib.optionals enableTk [ tcl tk tkinter libX11 ]
|
++ lib.optionals enableTk [ tcl tk tkinter libX11 ]
|
||||||
++ lib.optionals enableQt [ pyqt5 ];
|
++ 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 = ''
|
preBuild = ''
|
||||||
cp "$setup_cfg" ./setup.cfg
|
cp "$setup_cfg" ./setup.cfg
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
[directories]
|
|
||||||
basedirlist = .
|
|
||||||
|
|
||||||
[libs]
|
|
||||||
system_freetype = true
|
|
||||||
# LTO not working in darwin stdenv, see #19312
|
|
||||||
enable_lto = false
|
|
|
@ -1,5 +0,0 @@
|
||||||
[directories]
|
|
||||||
basedirlist = .
|
|
||||||
|
|
||||||
[libs]
|
|
||||||
system_freetype = true
|
|
Loading…
Reference in a new issue