pyrox.dev
lol
Reapply "python3Packages.pillow & python3Packages.pillow-simd: Fix cross compilation""
This reverts commit 68eb95705fac46c95832e84e4947a74db304bb33, reversing
changes made to 347a238ef8b00f6134315b5b441877bba56db344.
Moving the big rebuild to staging; original PR #249136, revert #251367
+4
-2
+1
-1
pkgs/development/python-modules/pillow-simd/default.nix
+1
-1
pkgs/development/python-modules/pillow-simd/default.nix
···
1
1
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k
2
2
, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2
3
3
, libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy, defusedxml
4
-
, pytestCheckHook
4
+
, pytestCheckHook, setuptools
5
5
}@args:
6
6
7
7
import ../pillow/generic.nix (rec {
+1
-1
pkgs/development/python-modules/pillow/default.nix
+1
-1
pkgs/development/python-modules/pillow/default.nix
···
6
6
, fetchpatch
7
7
, isPyPy
8
8
, defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11
9
-
, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook
9
+
, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools
10
10
# for passthru.tests
11
11
, imageio, matplotlib, pilkit, pydicom, reportlab
12
12
}@args:
+2
pkgs/development/python-modules/pillow/generic.nix
+2
pkgs/development/python-modules/pillow/generic.nix
···
39
39
40
40
nativeCheckInputs = [ pytestCheckHook pyroma numpy ];
41
41
42
+
nativeBuildInputs = [ setuptools ];
43
+
42
44
buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp libxcrypt tcl lcms2 ]
43
45
++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ]
44
46
++ lib.optionals (isPyPy) [ tk libX11 ];