From 37eeae6875e1164784bf7c453eb051392de1cdf5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 10 Feb 2024 16:00:19 +0000 Subject: [PATCH] nuraft: fix `gcc-13` build Without the change the build on `master` fails as https://hydra.nixos.org/build/247540058: In file included from /build/source/include/libnuraft/asio_service.hxx:24, from /build/source/src/asio_service.cxx:28: /build/source/include/libnuraft/asio_service_options.hxx:33:33: error: 'uint64_t' has not been declared 33 | uint64_t t = 0, | ^~~~~~~~ --- pkgs/development/libraries/nuraft/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/development/libraries/nuraft/default.nix index 6d75ba99fc6a..e26d9f467e7f 100644 --- a/pkgs/development/libraries/nuraft/default.nix +++ b/pkgs/development/libraries/nuraft/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, asio, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, asio, openssl, zlib }: stdenv.mkDerivation rec { pname = "nuraft"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-puO8E7tSLqB0oq/NlzEZqQgIZKm7ZUb4HhR0XuI9dco="; }; + patches = [ + # Fix gcc-13 build failure: + # https://github.com/eBay/NuRaft/pull/435 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/eBay/NuRaft/commit/fddf33a4d8cd7fcd0306cc838a30893a4df3d58f.patch"; + hash = "sha256-JOtR3llE4QwQM7PBx+ILR87zsPB0GZ/aIKbSdHIrePA="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost asio openssl zlib ];