Merge pull request #294782 from trofi/v8-to-gcc-13

v8: pull upstream fix for `gcc-13`
This commit is contained in:
Weijia Wang 2024-03-10 23:34:15 +01:00 committed by GitHub
commit b1da94375c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions

View File

@ -79,6 +79,14 @@ stdenv.mkDerivation rec {
patches = [
./darwin.patch
# gcc-13 build fix for mixxign <cstdint> includes
(fetchpatch {
name = "gcc-13.patch";
url = "https://chromium.googlesource.com/v8/v8/+/c2792e58035fcbaa16d0cb70998852fbeb5df4cc^!?format=TEXT";
decode = "base64 -d";
hash = "sha256-hoPAkSaCmzXflPFXaKUwVPLECMpt6N6/8m8mBSTAHbU=";
})
];
src = v8Src;

View File

@ -25128,7 +25128,7 @@ with pkgs;
ucommon = callPackage ../development/libraries/ucommon { };
v8 = pin-to-gcc12-if-gcc13 (callPackage ../development/libraries/v8 (
v8 = callPackage ../development/libraries/v8 (
let
stdenv' = if stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "16"
then overrideLibcxx llvmPackages_15.stdenv
@ -25137,7 +25137,7 @@ with pkgs;
{
stdenv = if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv';
}
));
);
intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { };