From 6152eed6a5277d1e6b4c68592b8a9796615db438 Mon Sep 17 00:00:00 2001 From: Artturi Date: Fri, 24 Feb 2023 05:21:20 +0200 Subject: [PATCH 1/2] Revert "python310Packages.kiwisolver: fix NIX_CFLAGS_COMPILE definition" --- pkgs/development/python-modules/kiwisolver/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index 0a985bc3dee0..ba35537a866b 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -20,7 +20,9 @@ buildPythonPackage rec { hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ + "-I${lib.getDev libcxx}/include/c++/v1" + ]; nativeBuildInputs = [ setuptools-scm From e1fe0fe490bf39bb12f7d84125a968eabfdfcbf8 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 24 Feb 2023 05:39:54 +0200 Subject: [PATCH 2/2] python310Packages.kiwisolver: move NIX_CFLAGS_COMPILE out of env this will be reapplied to staging because it causes rebuilds --- pkgs/development/python-modules/kiwisolver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index ba35537a866b..1481bc8699c0 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-I${lib.getDev libcxx}/include/c++/v1" ];