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

Merge pull request #263854 from wegank/ueberzugpp-fix 

microsoft-gsl, tbb_2021_8, ueberzugpp: fix build with clang 16
parents 3713f039 57d7de92

pkgs/development/libraries/microsoft-gsl/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [ cmake pkg-config ];

  buildInputs = [ gtest ];



  # error: unsafe buffer access

  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unsafe-buffer-usage";



  doCheck = true;



  meta = with lib; {

pkgs/development/libraries/tbb/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec { 
  # Fix build with modern gcc

  # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',

  NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" ] ++

    # error: variable 'val' set but not used

    lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++

    # Workaround for gcc-12 ICE when using -O3

    # https://gcc.gnu.org/PR108854

    lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ];

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -36047,9 +36047,7 @@ with pkgs; 














  ueberzug = with python3Packages; toPythonApplication ueberzug;



























  ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp {













    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv;













  };













  ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { };





























  uefi-run = callPackage ../tools/virtualization/uefi-run { };