diff options
author | lethalman <lucabru@src.gnome.org> | 2015-02-26 17:27:35 +0100 |
---|---|---|
committer | lethalman <lucabru@src.gnome.org> | 2015-02-26 17:27:35 +0100 |
commit | f91fbe311753854bff7e2e61d0da663ac6d196b4 (patch) | |
tree | a6241a2e800d8aad9e73a9c41f669a665dee6ec4 /pkgs/top-level | |
parent | e071b6d71ba6bbf02a321021af14e53be89de31a (diff) | |
parent | eacaba303f0f256128479d6596c614b2a395c8d8 (diff) | |
download | nixpkgs-f91fbe311753854bff7e2e61d0da663ac6d196b4.tar nixpkgs-f91fbe311753854bff7e2e61d0da663ac6d196b4.tar.gz nixpkgs-f91fbe311753854bff7e2e61d0da663ac6d196b4.tar.bz2 nixpkgs-f91fbe311753854bff7e2e61d0da663ac6d196b4.tar.lz nixpkgs-f91fbe311753854bff7e2e61d0da663ac6d196b4.tar.xz nixpkgs-f91fbe311753854bff7e2e61d0da663ac6d196b4.tar.zst nixpkgs-f91fbe311753854bff7e2e61d0da663ac6d196b4.zip |
Merge pull request #6570 from prikhi/fix-pillow-33
python pillow: fix expression for python3.3
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4467807a456..c91c5340b6f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7418,7 +7418,7 @@ let buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ] - ++ optionals (isPy26 || isPyPy) [ pkgs.lcms2 ] + ++ optionals (isPy26 || isPy33 || 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. |