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

pythonPackages.matplotlib: fix dependencies to use pyqt5 instead

This commit is contained in:
ft 2019-10-19 16:23:54 -07:00 committed by Frederik Rietdijk
parent 1f02f7cf60
commit af7378397f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
, 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
, enableQt ? false, pyqt4 , enableQt ? false, pyqt5 ? null
, libcxx , libcxx
, Cocoa , Cocoa
, pythonOlder , pythonOlder
@ -19,7 +19,7 @@ assert enableTk -> (tcl != null)
&& (tkinter != null) && (tkinter != null)
&& (libX11 != null) && (libX11 != null)
; ;
assert enableQt -> pyqt4 != null; assert enableQt -> pyqt5 != null;
buildPythonPackage rec { buildPythonPackage rec {
version = "3.1.1"; version = "3.1.1";
@ -49,7 +49,7 @@ buildPythonPackage rec {
++ 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 ]
++ 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 [ pyqt5 ];
patches = patches =
[ ./basedirlist.patch ]; [ ./basedirlist.patch ];