diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2021-01-24 01:29:22 +0100 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2021-01-24 01:29:22 +0100 |
| commit | a4bbfba80dbdccf7c3d3ac64fc7afa2494cf743a (patch) | |
| tree | 3130d7196a32753da705075e39ed2a2d6673a9f2 /pkgs/development/python-modules/matplotlib | |
| parent | 2f34b4b883932f0ee2c1787e704f3915786e8cca (diff) | |
pkgs/development/python-modules: stdenv.lib -> lib
Diffstat (limited to 'pkgs/development/python-modules/matplotlib')
| -rw-r--r-- | pkgs/development/python-modules/matplotlib/2.nix | 19 | ||||
| -rw-r--r-- | pkgs/development/python-modules/matplotlib/default.nix | 15 |
2 files changed, 16 insertions, 18 deletions
diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index ed6ebb1af490d..2c929d9a694e0 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -42,17 +42,17 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ which sphinx ] - ++ stdenv.lib.optional enableGhostscript ghostscript - ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; + ++ lib.optional enableGhostscript ghostscript + ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver libpng mock pytz ] - ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache - ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] - ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] - ++ stdenv.lib.optionals enableQt [ pyqt4 ] - ++ stdenv.lib.optionals python.isPy2 [ functools32 subprocess32 ]; + ++ lib.optional (pythonOlder "3.3") backports_functools_lru_cache + ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] + ++ lib.optionals enableTk [ tcl tk tkinter libX11 ] + ++ lib.optionals enableQt [ pyqt4 ] + ++ lib.optionals python.isPy2 [ functools32 subprocess32 ]; setup_cfg = ./setup.cfg; preBuild = '' @@ -67,10 +67,9 @@ buildPythonPackage rec { # script. postPatch = let - inherit (stdenv.lib.strings) substring; - tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"''; + tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"''; in - stdenv.lib.optionalString enableTk + lib.optionalString enableTk "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py"; # Matplotlib needs to be built against a specific version of freetype in diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 11ea3251e0a1b..bf21422b77211 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -35,15 +35,15 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ which sphinx ] - ++ stdenv.lib.optional enableGhostscript ghostscript - ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; + ++ lib.optional enableGhostscript ghostscript + ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil numpy pyparsing tornado freetype kiwisolver certifi libpng mock pytz pillow ] - ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] - ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] - ++ stdenv.lib.optionals enableQt [ pyqt5 ]; + ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] + ++ lib.optionals enableTk [ tcl tk tkinter libX11 ] + ++ lib.optionals enableQt [ pyqt5 ]; setup_cfg = if stdenv.isDarwin then ./setup-darwin.cfg else ./setup.cfg; preBuild = '' @@ -58,10 +58,9 @@ buildPythonPackage rec { # script. postPatch = let - inherit (stdenv.lib.strings) substring; - tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"''; + tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"''; in - stdenv.lib.optionalString enableTk + lib.optionalString enableTk "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py"; # Matplotlib needs to be built against a specific version of freetype in |