b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Reapply "python3Packages.pillow & python3Packages.pillow-simd: Fix cross compilation""

Browse source 
This reverts commit 68eb95705f, reversing
changes made to 347a238ef8.
Moving the big rebuild to staging; original PR #249136, revert #251367
This commit is contained in:
Vladimír Čunát 2023-08-25 20:07:09 +02:00
parent d87700501a
commit 094bfcf237
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/python-modules/pillow-simd/default.nix
View file

@ -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 {

2
pkgs/development/python-modules/pillow/default.nix
View file

@ -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:

2
pkgs/development/python-modules/pillow/generic.nix
View file

@ -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 ];