From 81745f10589aed961196cbc7b46899f11f37c44a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 24 Feb 2024 22:26:46 +0000 Subject: [PATCH] stellar-core: fix `gcc-13` build Without the change build fails on `master` as https://hydra.nixos.org/build/249037972: libmedida/src/medida/histogram.cc: In constructor 'medida::Histogram::Impl::Impl(medida::SamplingInterface::SampleType, std::chrono::seconds)': libmedida/src/medida/histogram.cc:134:18: error: 'invalid_argument' is not a member of 'std' 134 | throw std::invalid_argument("invalid sample_type"); | ^~~~~~~~~~~~~~~~ --- .../blockchains/stellar-core/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 5a70cce93174..16865f7709f3 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -2,6 +2,7 @@ , automake , bison , fetchFromGitHub +, fetchpatch , flex , git , lib @@ -25,6 +26,23 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + # Fix gcc-13 build failure due to missing include + # https://github.com/stellar/medida/pull/34 + (fetchpatch { + name = "gcc-13-p1.patch"; + url = "https://github.com/stellar/medida/commit/f91354b0055de939779d392999975d611b1b1ad5.patch"; + stripLen = 1; + extraPrefix = "lib/libmedida/"; + hash = "sha256-iVeSUY5Rcy62apIKJdbcHGgxAxpQCkygf85oSjbTTXU="; + }) + (fetchpatch { + name = "gcc-13-p2.patch"; + url = "https://github.com/stellar/stellar-core/commit/477b3135281b629554cabaeacfcdbcdc170aa335.patch"; + hash = "sha256-UVRcAIA5LEaCn16lWfhg19UU7b/apigzTsfPROLZtYg="; + }) + ]; + nativeBuildInputs = [ automake autoconf