From c31f399f1ca04e5240ea14090713df230bf89375 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 6 Sep 2023 19:11:45 -0400 Subject: [PATCH] _7zz: fix build with clang 13+ 7zz uses `-Weverything` and `-Werror`, which results in normally disabled warnings breaking the build with newer versions of clang. --- pkgs/tools/archivers/7zz/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 6df03f1d83d26..48b072b0cf4b6 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -69,6 +69,16 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ "-Wno-conversion" "-Wno-unused-macros" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-declaration-after-statement" + (lib.optionals (lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "13") [ + "-Wno-reserved-identifier" + "-Wno-unused-but-set-variable" + ]) + (lib.optionals (lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "16") [ + "-Wno-unsafe-buffer-usage" + "-Wno-cast-function-type-strict" + ]) ]); inherit makefile;