ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

pythonPackages.matplotlib: re-add Cocoa as buildInput on darwin (#22741)

Browse Source
This commit is contained in:
georgewhewell 2017-02-13 14:03:59 +00:00 committed by Robin Gloster
parent c0d1226750
commit 99fdc8b651
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@
, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
, enableQt ? false, pyqt4 , enableQt ? false, pyqt4
, libcxx , libcxx
, Cocoa
}: }:
assert enableGhostscript -> ghostscript != null; assert enableGhostscript -> ghostscript != null;
@ -32,7 +33,8 @@ buildPythonPackage rec {
XDG_RUNTIME_DIR = "/tmp"; XDG_RUNTIME_DIR = "/tmp";
buildInputs = [ python which sphinx stdenv ] buildInputs = [ python which sphinx stdenv ]
++ stdenv.lib.optional enableGhostscript ghostscript; ++ stdenv.lib.optional enableGhostscript ghostscript
++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
propagatedBuildInputs = propagatedBuildInputs =
[ cycler dateutil nose numpy pyparsing tornado freetype [ cycler dateutil nose numpy pyparsing tornado freetype

1
pkgs/top-level/python-packages.nix
View File

@ -14281,6 +14281,7 @@ in {
matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { matplotlib = callPackage ../development/python-modules/matplotlib/default.nix {
stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
enableGhostscript = true; enableGhostscript = true;
inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
}; };