Skip to content

Commit

Permalink
Update poetry2nix override for pillow == 9.5.0
Browse files Browse the repository at this point in the history
There is a bug in the `pillow` 9.5.0 release that breaks the build:

  nix-community/poetry2nix#1139
  python-pillow/Pillow#7069

Apply the patch with the upstream fix when building version 9.5.0.

The old override is still kept, even though the main part of that
override was included in nix-community/poetry2nix#689 (the problem is
that `buildInputs` in the poetry2nix override does not include all
packages that are in the nixpkgs package for `pillow`, and therefore
`preConfigure` might add references to nonexistent packages).
  • Loading branch information
sigprof committed May 5, 2023
1 parent 87143b7 commit e6350e6
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ let
propagatedBuildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.propagatedBuildInputs;
buildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.buildInputs;
preConfigure = (old.preConfigure or "") + pkgs.python3.pkgs.pillow.preConfigure;

# https://github.com/nix-community/poetry2nix/issues/1139
patches = (old.patches or []) ++ lib.optionals (old.version == "9.5.0") [
(pkgs.fetchpatch {
url = "https://github.com/python-pillow/Pillow/commit/0ec0a89ead648793812e11739e2a5d70738c6be5.diff";
sha256 = "sha256-rZfk+OXZU6xBpoumIW30E80gRsox/Goa3hMDxBUkTY0=";
})
];
});
qmk = super.qmk.overridePythonAttrs(old: {
# Allow QMK CLI to run "qmk" as a subprocess (the wrapper changes
Expand Down

0 comments on commit e6350e6

Please sign in to comment.