diff options
| author | Domen Kožar <domen@dev.si> | 2015-12-02 09:22:52 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-12-02 09:22:52 +0100 |
| commit | 0d2ac2b08c6e9a1f51de541b85ee0322423331c1 (patch) | |
| tree | fd52379e29d748cca73c2a38cd7f5d8baa90a6b3 /pkgs | |
| parent | 31ed92f65f4e117718dc5a963920fdf5f489a24f (diff) | |
| parent | 87b2e1e16af4b03adf96d75f5ba0bbb010641d16 (diff) | |
| download | nixpkgs-0d2ac2b08c6e9a1f51de541b85ee0322423331c1.tar nixpkgs-0d2ac2b08c6e9a1f51de541b85ee0322423331c1.tar.gz nixpkgs-0d2ac2b08c6e9a1f51de541b85ee0322423331c1.tar.bz2 nixpkgs-0d2ac2b08c6e9a1f51de541b85ee0322423331c1.tar.lz nixpkgs-0d2ac2b08c6e9a1f51de541b85ee0322423331c1.tar.xz nixpkgs-0d2ac2b08c6e9a1f51de541b85ee0322423331c1.tar.zst nixpkgs-0d2ac2b08c6e9a1f51de541b85ee0322423331c1.zip | |
Merge pull request #11392 from ktosiek/closure-size
pythonPackages.pillow: fix for multiple outputs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6dda39de319..97f79692e58 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13189,13 +13189,15 @@ in modules // { ++ optionals (isPyPy) [ pkgs.tk pkgs.xorg.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. - preConfigure = '' + preConfigure = let + libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; + in '' sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ; + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude pkgs.freetype}|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude pkgs.libjpeg}|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude pkgs.zlib}|g ; s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ; + s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude pkgs.libtiff}|g ; s|^TCL_ROOT=.*$|TCL_ROOT = _lib_include("${pkgs.tcl}")|g ;' '' # Remove impurities |