Skip to content

Commit 650be92

Browse files
authored
Nix shell updates (#17243)
1 parent 0e11b51 commit 650be92

File tree

4 files changed

+223
-136
lines changed

4 files changed

+223
-136
lines changed

shell.nix

+8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ let
2929
pythonEnv = poetry2nix.mkPoetryEnv {
3030
projectDir = ./util/nix;
3131
overrides = poetry2nix.overrides.withDefaults (self: super: {
32+
pillow = super.pillow.overridePythonAttrs(old: {
33+
# Use preConfigure from nixpkgs to fix library detection issues and
34+
# impurities which can break the build process; this also requires
35+
# adding propagatedBuildInputs and buildInputs from the same source.
36+
propagatedBuildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.propagatedBuildInputs;
37+
buildInputs = (old.buildInputs or []) ++ pkgs.python3.pkgs.pillow.buildInputs;
38+
preConfigure = (old.preConfigure or "") + pkgs.python3.pkgs.pillow.preConfigure;
39+
});
3240
qmk = super.qmk.overridePythonAttrs(old: {
3341
# Allow QMK CLI to run "qmk" as a subprocess (the wrapper changes
3442
# $PATH and breaks these invocations).

0 commit comments

Comments
 (0)