From 8ad2cb1d0cc9af530a3b1fa0f914359136f48d32 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Sun, 4 Mar 2018 19:13:58 -0800 Subject: [PATCH] pillow: Fix build on non-NixOS systems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Pillow install script will, by default, add paths like /usr/lib and /usr/include to the search paths. This can break things when building on a non-NixOS system that has some libraries installed that are not installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't build Pillow with this support). We solve this by telling Pillow to knock it off 😄 Fixes #36317 --- pkgs/development/python-modules/pillow/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 034748255277..cb6008ea9a2b 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -31,6 +31,14 @@ buildPythonPackage rec { ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. + # NOTE: The Pillow install script will, by default, add paths like /usr/lib + # and /usr/include to the search paths. This can break things when building + # on a non-NixOS system that has some libraries installed that are not + # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't + # build Pillow with this support). We patch the `disable_platform_guessing` + # setting here, instead of passing the `--disable-platform-guessing` + # command-line option, since the command-line option doesn't work when we run + # tests. preConfigure = let libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"''; libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"''; @@ -41,7 +49,8 @@ buildPythonPackage rec { s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; - s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ;' + s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ; + s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;' export LDFLAGS="-L${libwebp}/lib" export CFLAGS="-I${libwebp}/include" ''