public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages.pillow: dont depend on _lib_include to be presnet in setup.py

Browse Source
This commit is contained in:
Rok Garbas 2016-07-25 04:20:14 +02:00
parent b8ab178e4c
commit 6f0d12a5c8
No known key found for this signature in database
GPG Key ID: A0E01EF44C27BF00
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/python-packages.nix
View File

@ -17093,9 +17093,9 @@ in modules // {
-e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude pkgs.freetype}|g ; -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude pkgs.freetype}|g ;
s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude pkgs.libjpeg}|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude pkgs.libjpeg}|g ;
s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude pkgs.zlib}|g ; s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude pkgs.zlib}|g ;
s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ; s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude pkgs.libwebp}|g ;
s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude pkgs.libtiff}|g ; s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude pkgs.libtiff}|g ;
s|^TCL_ROOT=.*$|TCL_ROOT = _lib_include("${pkgs.tcl}")|g ;' s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude pkgs.tcl}|g ;'
'' ''
# Remove impurities # Remove impurities
+ stdenv.lib.optionalString stdenv.isDarwin '' + stdenv.lib.optionalString stdenv.isDarwin ''