Skip to content

Commit

Permalink
Adopt nixpkgs pillow preConfigure script
Browse files Browse the repository at this point in the history
  • Loading branch information
crossing committed Aug 22, 2022
1 parent bb9a82d commit 547c9e1
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion overrides/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1351,13 +1351,18 @@ lib.composeManyExtensions [
);

pillow = super.pillow.overridePythonAttrs (
old: {
old:
let
preConfigure = (old.preConfigure or "") + pkgs.python3.pkgs.pillow.preConfigure;
in
{
nativeBuildInputs = (old.nativeBuildInputs or [ ])
++ [ pkg-config self.pytest-runner ];
buildInputs = with pkgs; (old.buildInputs or [ ])
++ [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ]
++ lib.optionals (lib.versionAtLeast old.version "7.1.0") [ xorg.libxcb ]
++ lib.optionals (self.isPyPy) [ tk xorg.libX11 ];
preConfigure = lib.optional (old.format != "wheel") preConfigure;
}
);

Expand Down

0 comments on commit 547c9e1

Please sign in to comment.