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

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

v8: pull upstream fix for `gcc-13`
parents ad272aad 4ef81aa1

pkgs/development/libraries/v8/default.nix

+8 −0
Original line number Diff line number Diff line
@@ -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;

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 { };