diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 7edf2cdf7c46..6d9758f75a40 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -79,6 +79,14 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + + # gcc-13 build fix for mixxign 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae6de2f99b33..5cfd603271dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25140,7 +25140,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 @@ -25149,7 +25149,7 @@ with pkgs; { stdenv = if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; } - )); + ); intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { };