diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-10 23:34:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-10 23:34:15 +0100 |
| commit | b1da94375cf40d4774f0d29a0dd21d4d07087723 (patch) | |
| tree | ae02ff556dbdbe2a1d504fa6ee0cccc92cb704e3 /pkgs/top-level | |
| parent | ad272aadc442e69b09027d11e7d81aaa8de49d55 (diff) | |
| parent | 4ef81aa1907bfa9fb35d196184b9f6b9defedcb8 (diff) | |
Merge pull request #294782 from trofi/v8-to-gcc-13
v8: pull upstream fix for `gcc-13`
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 318f1de1fb5fc..d3a68d73ff4e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |