Merge pull request #249136 from OroraTech/chore/fix-pillow
python3Packages.pillow & python3Packages.pillow-simd: Fix cross compilation
This commit is contained in:
commit
0fdae6857d
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k
|
||||
, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2
|
||||
, libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy, defusedxml
|
||||
, pytestCheckHook
|
||||
, pytestCheckHook, setuptools
|
||||
}@args:
|
||||
|
||||
import ../pillow/generic.nix (rec {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, fetchpatch
|
||||
, isPyPy
|
||||
, defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11
|
||||
, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook
|
||||
, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools
|
||||
# for passthru.tests
|
||||
, imageio, matplotlib, pilkit, pydicom, reportlab
|
||||
}@args:
|
||||
|
|
|
@ -39,6 +39,8 @@ buildPythonPackage rec {
|
|||
|
||||
nativeCheckInputs = [ pytestCheckHook pyroma numpy ];
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp libxcrypt tcl lcms2 ]
|
||||
++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ]
|
||||
++ lib.optionals (isPyPy) [ tk libX11 ];
|
||||
|
|
Loading…
Reference in a new issue