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

Merge pull request #89652 from marsam/fix-pillow-darwin

Browse Source 
python37Packages.pillow: fix build on darwin
This commit is contained in:
Mario Rodas 2020-06-06 20:52:45 -05:00 committed by GitHub
commit 7a8614cf91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/python-modules/pillow/default.nix
View File

@ -2,7 +2,7 @@
, olefile , olefile
, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
, openjpeg, libimagequant , openjpeg, libimagequant
, pytest, pytestrunner, pyroma, numpy , pyroma, numpy, pytestCheckHook
, isPy3k , isPy3k
}: }:
@ -23,15 +23,12 @@ buildPythonPackage rec {
rm Tests/test_imagefont.py rm Tests/test_imagefont.py
''; '';
checkPhase = '' # Disable darwin tests which require executables: `iconutil` and `screencapture`
runHook preCheck disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ];
python -m pytest -v -x -W always
runHook postCheck
'';
propagatedBuildInputs = [ olefile ]; propagatedBuildInputs = [ olefile ];
checkInputs = [ pytest pytestrunner pyroma numpy ]; checkInputs = [ pytestCheckHook pyroma numpy ];
buildInputs = [ buildInputs = [
freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ]
@ -71,8 +68,8 @@ buildPythonPackage rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://python-pillow.github.io/"; homepage = "https://python-pillow.org/";
description = "Fork of The Python Imaging Library (PIL)"; description = "The friendly PIL fork (Python Imaging Library)";
longDescription = '' longDescription = ''
The Python Imaging Library (PIL) adds image processing The Python Imaging Library (PIL) adds image processing
capabilities to your Python interpreter. This library capabilities to your Python interpreter. This library