From daa4cd2c2a12a48a41ae9e14ade1a978f6b39b40 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 7 Nov 2023 07:35:22 -0500 Subject: darwin.text_cmds: fix build with clang 16 --- .../os-specific/darwin/apple-source-releases/text_cmds/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix index c99523d6c86..c6fc0094303 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix @@ -20,7 +20,12 @@ appleDerivation { done ''; - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=format-security" ]; # hardeningDisable doesn't cut it + env.NIX_CFLAGS_COMPILE = toString [ + # hardeningDisable doesn't cut it + "-Wno-error=format-security" + # Required to build with clang 16 + "-Wno-error=deprecated-non-prototype" + ]; meta = { platforms = lib.platforms.darwin; -- cgit 1.4.1 From 2feff8a9bf1e688ea70c1df724c9b4235b891ee0 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 7 Nov 2023 09:17:11 -0500 Subject: inetutils: fix build on x86_64-darwin This is a workaround to avoid mass rebuilds in staging-next. The problem is the 10.12 source-based SDK does not include `utmp.h`, but it should. Another PR will fix that for the next staging cycle and revert this commit. --- pkgs/tools/networking/inetutils/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index e4eb2eeaac4..9b1723a4d12 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -34,6 +34,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ help2man perl /* for `whois' */ ]; buildInputs = [ ncurses /* for `talk' */ libxcrypt ]; + env = lib.optionalAttrs stdenv.isDarwin { + # This is a temporary workaround for missing headers in the 10.12 SDK to avoid a mass rebuild. + # A commit to revert this change will be included in the fix PR targeting staging. + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + # Don't use help2man if cross-compiling # https://lists.gnu.org/archive/html/bug-sed/2017-01/msg00001.html # https://git.congatec.com/yocto/meta-openembedded/blob/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb#L44 -- cgit 1.4.1