From ddf266fd77ab1aa1180e58e6f278dca9b8470dfe Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 24 Dec 2023 12:05:20 +0000 Subject: [PATCH] libtins: pull upstream fix for gcc-13 Without the change build fails as: /build/source/src/../include/tins/ip_address.h:265:31: error: 'uint32_t' is not a member of 'std'; did you mean 'wint_t'? 265 | return std::hash()(addr); | ^~~~~~~~ | wint_t --- pkgs/development/libraries/libtins/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index b96c02a35bfd..b27ad6634797 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -1,4 +1,4 @@ -{ boost, cmake, fetchFromGitHub, gtest, libpcap, openssl, lib, stdenv }: +{ boost, cmake, fetchFromGitHub, fetchpatch, gtest, libpcap, openssl, lib, stdenv }: stdenv.mkDerivation rec { pname = "libtins"; @@ -11,6 +11,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-mXbinXh/CO0SZZ71+K+FozbHCCoi12+AIa2o+P0QmUw="; }; + patches = [ + # Pull gcc-13 fixes: + # https://github.com/mfontanini/libtins/pull/496 + # TODO: remove when upgrade to the next version. + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/mfontanini/libtins/commit/812be7966d445ec56e88eab512f8fd2d57152427.patch"; + hash = "sha256-5RCFPe95r1CBrAocjTPR2SvUlgaGa1aBc8RazyxUj3M="; + }) + ]; + postPatch = '' rm -rf googletest cp -r ${gtest.src} googletest