Nix shell updates (qmk#17243)

christrotter · May 31, 2022 · 650be92 · 650be92
1 parent 0e11b51
commit 650be92
Show file tree

Hide file tree

Showing 4 changed files with 223 additions and 136 deletions.
diff --git a/shell.nix b/shell.nix
@@ -29,6 +29,14 @@ let
   pythonEnv = poetry2nix.mkPoetryEnv {
     projectDir = ./util/nix;
     overrides = poetry2nix.overrides.withDefaults (self: super: {
+      pillow = super.pillow.overridePythonAttrs(old: {
+        # Use preConfigure from nixpkgs to fix library detection issues and
+        # impurities which can break the build process; this also requires
+        # adding propagatedBuildInputs and buildInputs from the same source.
+        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;
+      });
       qmk = super.qmk.overridePythonAttrs(old: {
         # Allow QMK CLI to run "qmk" as a subprocess (the wrapper changes
         # $PATH and breaks these invocations).