From 02fdd9162ead53fe553a2dc0316d643bfa1addcf Mon Sep 17 00:00:00 2001 From: ashgillman Date: Thu, 10 Mar 2016 16:01:44 +1000 Subject: [PATCH 1/2] python34 pillow: add build input lcms2 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77f70d7b7145..eb5db9c6d8db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15375,7 +15375,7 @@ in modules // { buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl nose ] - ++ optionals (isPy26 || isPy27 || isPy33 || isPyPy) [ pkgs.lcms2 ] + ++ optionals (isPy26 || isPy27 || isPy33 || isPy34 || isPyPy) [ pkgs.lcms2 ] ++ optionals (isPyPy) [ pkgs.tk pkgs.xorg.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. From 6ab7c50ea640008e6a3a7685f481cf1a06c31f1f Mon Sep 17 00:00:00 2001 From: ashgillman Date: Thu, 10 Mar 2016 22:16:00 +1000 Subject: [PATCH 2/2] Use lcms2 for all pillow python versions --- pkgs/top-level/python-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb5db9c6d8db..30c624509624 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15374,8 +15374,7 @@ in modules // { doCheck = false; buildInputs = with self; [ - pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl nose ] - ++ optionals (isPy26 || isPy27 || isPy33 || isPy34 || isPyPy) [ pkgs.lcms2 ] + pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl nose pkgs.lcms2 ] ++ optionals (isPyPy) [ pkgs.tk pkgs.xorg.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.