From eed6207e96b7fa62d624e259bd6da00976a6701b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 29 May 2023 22:13:37 +0100 Subject: [PATCH] abseil-cpp: backport gcc-13 fix Without the change `abseil-cpp` build fails on `gcc-13` as: /build/abseil-cpp/absl/strings/internal/str_format/extension.h:34:33: error: found ':' in nested-name-specifier, expected '::' 34 | enum class FormatConversionChar : uint8_t; | ^ | :: --- pkgs/development/libraries/abseil-cpp/202103.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/development/libraries/abseil-cpp/202103.nix index 1c75853f52203..712f89e383fff 100644 --- a/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/pkgs/development/libraries/abseil-cpp/202103.nix @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { url = "https://github.com/abseil/abseil-cpp/commit/5bfa70c75e621c5d5ec095c8c4c0c050dcb2957e.patch"; sha256 = "0nhjxqfxpi2pkfinnqvd5m4npf9l1kg39mjx9l3087ajhadaywl5"; }) + + # Bacport gcc-13 fix: + # https://github.com/abseil/abseil-cpp/pull/1187 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/abseil/abseil-cpp/commit/36a4b073f1e7e02ed7d1ac140767e36f82f09b7c.patch"; + hash = "sha256-aA7mwGEtv/cQINcawjkukmCvfNuqwUeDFssSiNKPdgg="; + }) ] ++ lib.optionals stdenv.hostPlatform.isLoongArch64 [ # https://github.com/abseil/abseil-cpp/pull/1110 (fetchpatch {