From 1c2d8babcd0bfbf0aa27dfd1dcf07e3a8fa1be07 Mon Sep 17 00:00:00 2001 From: Pavan Rikhi Date: Mon, 15 Dec 2014 18:44:36 -0500 Subject: [PATCH] python pillow: fix build for py2.6 and pypy --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e51f427efa5..ce1829fc62bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6782,7 +6782,10 @@ let md5 = "56b6614499aacb7d6b5983c4914daea7"; }; - buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ]; + buildInputs = with self; [ + pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ] + ++ optionals (isPy26 || isPyPy) [ pkgs.lcms2 ] + ++ optionals (isPyPy) [ pkgs.tk pkgs.xlibs.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. preConfigure = '' @@ -6809,7 +6812,7 @@ let license = "http://www.pythonware.com/products/pil/license.htm"; - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = with stdenv.lib.maintainers; [ goibhniu prikhi ]; }; };