Unverified Commit 4c234cee authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #266068 from reckenrode/clang16-fixes-batch4 

darwin.text_cmds,inetutils: fix build with clang 16
parents 15059812 2feff8a9

pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix

+6 −1
Original line number Diff line number Diff line
@@ -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;

pkgs/tools/networking/inetutils/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -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