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

matplotlib: remove optional gtk2

Browse Source
This commit is contained in:
worldofpeace 2019-11-27 13:37:34 -05:00
parent 7cae93c29c
commit 48fdd1a255
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,8 @@
{ stdenv, fetchPypi, python, buildPythonPackage, pycairo, backports_functools_lru_cache { stdenv, fetchPypi, 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, pkgconfig, mock, pytz, pygobject3, functools32, subprocess32 , freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32
, fetchpatch , fetchpatch
, enableGhostscript ? false, ghostscript ? null, gtk3 , enableGhostscript ? false, ghostscript ? null, gtk3
, enableGtk2 ? false, pygtk ? null, gobject-introspection
, enableGtk3 ? false, cairo , enableGtk3 ? false, cairo
# darwin has its own "MacOSX" backend # darwin has its own "MacOSX" backend
, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
@ -14,7 +13,6 @@
}: }:
assert enableGhostscript -> ghostscript != null; assert enableGhostscript -> ghostscript != null;
assert enableGtk2 -> pygtk != null;
assert enableTk -> (tcl != null) assert enableTk -> (tcl != null)
&& (tk != null) && (tk != null)
&& (tkinter != null) && (tkinter != null)
@ -45,7 +43,6 @@ buildPythonPackage rec {
[ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
libpng 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.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ stdenv.lib.optionals enableQt [ pyqt4 ] ++ stdenv.lib.optionals enableQt [ pyqt4 ]

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

@ -1,8 +1,7 @@
{ stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache { stdenv, fetchPypi, 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, pkgconfig, mock, pytz, pygobject3 , freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection
, enableGhostscript ? true, ghostscript ? null, gtk3 , enableGhostscript ? true, ghostscript ? null, gtk3
, enableGtk2 ? false, pygtk ? null, gobject-introspection
, enableGtk3 ? false, cairo , enableGtk3 ? false, cairo
# darwin has its own "MacOSX" backend # darwin has its own "MacOSX" backend
, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
@ -13,7 +12,6 @@
}: }:
assert enableGhostscript -> ghostscript != null; assert enableGhostscript -> ghostscript != null;
assert enableGtk2 -> pygtk != null;
assert enableTk -> (tcl != null) assert enableTk -> (tcl != null)
&& (tk != null) && (tk != null)
&& (tkinter != null) && (tkinter != null)
@ -46,7 +44,6 @@ buildPythonPackage rec {
[ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
libpng 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.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ stdenv.lib.optionals enableQt [ pyqt5 ]; ++ stdenv.lib.optionals enableQt [ pyqt5 ];