Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pythonPackages.matplotlib: fix headless detection #124439

Merged
merged 3 commits into from
May 26, 2021
Merged

pythonPackages.matplotlib: fix headless detection #124439

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e2ec8f
pythonPackages.matplotlib: fix headless detection
rnhmjoj May 25, 2021
3a3e113
pythonPackages.matplotlib: remove unsused arguments
rnhmjoj May 26, 2021
7672576
pythonPackages.matplotlib: add licenses
rnhmjoj May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions pkgs/development/python-modules/matplotlib/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
{ lib, stdenv, fetchPypi, writeText, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache
, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver
{ lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo
, which, cycler, dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver
, freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection
, certifi, pillow
, enableGhostscript ? true, ghostscript, gtk3
, enableGtk3 ? false, cairo
# darwin has its own "MacOSX" backend
, enableTk ? !stdenv.isDarwin, tcl, tk, tkinter, libX11
, enableTk ? !stdenv.isDarwin, tcl, tk, tkinter
, enableQt ? false, pyqt5
# required for headless detection
, libX11, wayland
, Cocoa
, pythonOlder
}:

let
interactive = enableTk || enableGtk3 || enableQt;
in

buildPythonPackage rec {
version = "3.4.1";
pname = "matplotlib";
Expand Down Expand Up @@ -62,8 +67,14 @@ buildPythonPackage rec {
let
tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"'';
in
lib.optionalString enableTk
"sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py";
lib.optionalString enableTk ''
sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py
'' + lib.optionalString (stdenv.isLinux && interactive) ''
# fix paths to libraries in dlopen calls (headless detection)
substituteInPlace src/_c_internal_utils.c \
--replace libX11.so.6 ${libX11}/lib/libX11.so.6 \
--replace libwayland-client.so.0 ${wayland}/lib/libwayland-client.so.0
'';

# Matplotlib needs to be built against a specific version of freetype in
# order for all of the tests to pass.
Expand All @@ -72,6 +83,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python plotting library, making publication quality plots";
homepage = "https://matplotlib.org/";
license = with licenses; [ psfl bsd0 ];
maintainers = with maintainers; [ lovek323 veprbl ];
};

Expand Down