From 650be92cf96440920ebf1079c11f2f36c4a9edc1 Mon Sep 17 00:00:00 2001 From: Sergey Vlasov Date: Tue, 31 May 2022 07:08:23 +0300 Subject: Nix shell updates (#17243) --- shell.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'shell.nix') diff --git a/shell.nix b/shell.nix index 4701c83bb6..a96aa840de 100644 --- 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). -- cgit v1.2.1