Merge pull request #263854 from wegank/ueberzugpp-fix

microsoft-gsl, tbb_2021_8, ueberzugpp: fix build with clang 16

authored by Weijia Wang and committed by GitHub e01f6abe 3713f039

+6 -3
+3
pkgs/development/libraries/microsoft-gsl/default.nix
··· 20 nativeBuildInputs = [ cmake pkg-config ]; 21 buildInputs = [ gtest ]; 22 23 doCheck = true; 24 25 meta = with lib; {
··· 20 nativeBuildInputs = [ cmake pkg-config ]; 21 buildInputs = [ gtest ]; 22 23 + # error: unsafe buffer access 24 + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unsafe-buffer-usage"; 25 + 26 doCheck = true; 27 28 meta = with lib; {
+2
pkgs/development/libraries/tbb/default.nix
··· 39 # Fix build with modern gcc 40 # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', 41 NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" ] ++ 42 # Workaround for gcc-12 ICE when using -O3 43 # https://gcc.gnu.org/PR108854 44 lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ];
··· 39 # Fix build with modern gcc 40 # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', 41 NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" ] ++ 42 + # error: variable 'val' set but not used 43 + lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ 44 # Workaround for gcc-12 ICE when using -O3 45 # https://gcc.gnu.org/PR108854 46 lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ];
+1 -3
pkgs/top-level/all-packages.nix
··· 36047 36048 ueberzug = with python3Packages; toPythonApplication ueberzug; 36049 36050 - ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { 36051 - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv; 36052 - }; 36053 36054 uefi-run = callPackage ../tools/virtualization/uefi-run { }; 36055
··· 36047 36048 ueberzug = with python3Packages; toPythonApplication ueberzug; 36049 36050 + ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { }; 36051 36052 uefi-run = callPackage ../tools/virtualization/uefi-run { }; 36053