diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-07 09:25:12 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-07 09:25:12 +0200 |
| commit | 6b8223e634b1326f448b870351ae53a0607aa043 (patch) | |
| tree | cc1754cc8e195a5b84bdadf0d01db22f73da25af /pkgs/top-level/python-packages.nix | |
| parent | 43f71029cc6b18c1b4db4d01b35dbb30425c2f4e (diff) | |
| parent | 1c3e3e081c22ba4dbf8f1b8cb31a55830596b838 (diff) | |
| download | nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.gz nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.bz2 nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.lz nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.xz nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.zst nixlib-6b8223e634b1326f448b870351ae53a0607aa043.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00960b457252..8a376a5abcbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5086,9 +5086,14 @@ in { pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; - pillow = callPackage ../development/python-modules/pillow { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; + pillow = if isPy27 then + callPackage ../development/python-modules/pillow/6.nix { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; + } else + callPackage ../development/python-modules/pillow { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; }; pkgconfig = callPackage ../development/python-modules/pkgconfig { |