mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 01:43:15 +00:00
matplotlib: remove optional gtk2
This commit is contained in:
parent
7cae93c29c
commit
48fdd1a255
@ -1,9 +1,8 @@
|
||||
{ stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache
|
||||
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
|
||||
, freetype, libpng, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32
|
||||
, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
|
||||
, fetchpatch
|
||||
, enableGhostscript ? false, ghostscript ? null, gtk3
|
||||
, enableGtk2 ? false, pygtk ? null, gobject-introspection
|
||||
, enableGtk3 ? false, cairo
|
||||
# darwin has its own "MacOSX" backend
|
||||
, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
|
||||
@ -14,7 +13,6 @@
|
||||
}:
|
||||
|
||||
assert enableGhostscript -> ghostscript != null;
|
||||
assert enableGtk2 -> pygtk != null;
|
||||
assert enableTk -> (tcl != null)
|
||||
&& (tk != null)
|
||||
&& (tkinter != null)
|
||||
@ -45,7 +43,6 @@ buildPythonPackage rec {
|
||||
[ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
|
||||
libpng mock pytz ]
|
||||
++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
|
||||
++ stdenv.lib.optional enableGtk2 pygtk
|
||||
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
|
||||
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
|
||||
++ stdenv.lib.optionals enableQt [ pyqt4 ]
|
||||
|
@ -1,8 +1,7 @@
|
||||
{ stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache
|
||||
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
|
||||
, freetype, libpng, pkgconfig, mock, pytz, pygobject3
|
||||
, freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection
|
||||
, enableGhostscript ? true, ghostscript ? null, gtk3
|
||||
, enableGtk2 ? false, pygtk ? null, gobject-introspection
|
||||
, enableGtk3 ? false, cairo
|
||||
# darwin has its own "MacOSX" backend
|
||||
, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
|
||||
@ -13,7 +12,6 @@
|
||||
}:
|
||||
|
||||
assert enableGhostscript -> ghostscript != null;
|
||||
assert enableGtk2 -> pygtk != null;
|
||||
assert enableTk -> (tcl != null)
|
||||
&& (tk != null)
|
||||
&& (tkinter != null)
|
||||
@ -46,7 +44,6 @@ buildPythonPackage rec {
|
||||
[ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
|
||||
libpng mock pytz ]
|
||||
++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
|
||||
++ stdenv.lib.optional enableGtk2 pygtk
|
||||
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
|
||||
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
|
||||
++ stdenv.lib.optionals enableQt [ pyqt5 ];
|
||||
|
Loading…
Reference in New Issue
Block a user