dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-11-08 00:02:52 +00:00 committed by GitHub
commit 89ac5d8ca3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

6
pkgs/tools/networking/inetutils/default.nix
View File

@ -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