Unverified Commit 68eb9570 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #251367: revert "python3Packages.pillow & python3Packages.pillow-simd: Fix cross compilation"

parents 347a238e 041756f8

pkgs/development/python-modules/pillow-simd/default.nix

+1 −1
Original line number Diff line number Diff line 
{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k

, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2

, libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy, defusedxml

, pytestCheckHook, setuptools

, pytestCheckHook

}@args:



import ../pillow/generic.nix (rec {

pkgs/development/python-modules/pillow/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
, fetchpatch

, isPyPy

, defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11

, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools

, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook

# for passthru.tests

, imageio, matplotlib, pilkit, pydicom, reportlab

}@args:

pkgs/development/python-modules/pillow/generic.nix

+0 −2
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ 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 ];