diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-06-24 20:41:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 20:41:40 +0200 |
| commit | 59c7eb60254431f1d2f7df550065100ccd852a0c (patch) | |
| tree | 68e1a2c95c5968635095e5f4b7eef43d4e439f60 /pkgs/development/python-modules/matplotlib | |
| parent | attic: unbreak "attic mount" by using old llfuse 0.41 (diff) | |
| parent | matplotlib: Add support for the TkAgg backend (diff) | |
| download | nixpkgs-59c7eb60254431f1d2f7df550065100ccd852a0c.tar.gz | |
Merge pull request #16476 from aherrmann/matplotlib-tkagg
Matplotlib tkagg
Diffstat (limited to 'pkgs/development/python-modules/matplotlib')
| -rw-r--r-- | pkgs/development/python-modules/matplotlib/basedirlist.patch | 8 | ||||
| -rw-r--r-- | pkgs/development/python-modules/matplotlib/default.nix | 27 |
2 files changed, 33 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/matplotlib/basedirlist.patch b/pkgs/development/python-modules/matplotlib/basedirlist.patch new file mode 100644 index 000000000000..0a84a05bbaea --- /dev/null +++ b/pkgs/development/python-modules/matplotlib/basedirlist.patch @@ -0,0 +1,8 @@ +diff --git a/setup.cfg b/setup.cfg +new file mode 100644 +index 0000000..6f81985 +--- /dev/null ++++ b/setup.cfg +@@ -0,0 +1,2 @@ ++[directories] ++basedirlist = . diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 6bc28fd95687..7c1b8b503a3a 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -4,11 +4,17 @@ , enableGhostscript ? false, ghostscript ? null, gtk3 , enableGtk2 ? false, pygtk ? null, gobjectIntrospection , enableGtk3 ? false, cairo +, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , Cocoa, Foundation, CoreData, cf-private, libobjc, libcxx }: assert enableGhostscript -> ghostscript != null; assert enableGtk2 -> pygtk != null; +assert enableTk -> (tcl != null) + && (tk != null) + && (tkinter != null) + && (libX11 != null) + ; buildPythonPackage rec { name = "matplotlib-${version}"; @@ -33,9 +39,26 @@ buildPythonPackage rec { libpng pkgconfig mock pytz ] ++ stdenv.lib.optional enableGtk2 pygtk - ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]; + ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ] + ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv.patch ]; + patches = + [ ./basedirlist.patch ] ++ + stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv.patch ]; + + # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the + # corresponding interpreter object for its library paths. This fails if + # `$DISPLAY` is not set. The fallback option assumes that Tcl/Tk are both + # installed under the same path which is not true in Nix. + # With the following patch we just hard-code these paths into the install + # script. + postPatch = + let + inherit (stdenv.lib.strings) substring; + tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"''; + in + stdenv.lib.optionalString enableTk + "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py"; checkPhase = '' ${python.interpreter} tests.py |