diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-07 21:17:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-07 21:17:33 +0100 |
| commit | 4c234ceeb61f6d111bb1db30376cdb4019e56142 (patch) | |
| tree | 4ef4741f71c9b269bc64b57bd071e5b0d8320e7e | |
| parent | 1505981287710bea9dd0bea8fda9a0817fb38ddf (diff) | |
| parent | 2feff8a9bf1e688ea70c1df724c9b4235b891ee0 (diff) | |
| download | nixpkgs-4c234ceeb61f6d111bb1db30376cdb4019e56142.tar nixpkgs-4c234ceeb61f6d111bb1db30376cdb4019e56142.tar.gz nixpkgs-4c234ceeb61f6d111bb1db30376cdb4019e56142.tar.bz2 nixpkgs-4c234ceeb61f6d111bb1db30376cdb4019e56142.tar.lz nixpkgs-4c234ceeb61f6d111bb1db30376cdb4019e56142.tar.xz nixpkgs-4c234ceeb61f6d111bb1db30376cdb4019e56142.tar.zst nixpkgs-4c234ceeb61f6d111bb1db30376cdb4019e56142.zip | |
Merge pull request #266068 from reckenrode/clang16-fixes-batch4
darwin.text_cmds,inetutils: fix build with clang 16
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/networking/inetutils/default.nix | 6 |
2 files changed, 12 insertions, 1 deletions
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; 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 |