From 7ceef45f5f8580ae0de368de685f843296517e1a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 9 Feb 2024 23:10:32 +0000 Subject: [PATCH] libhv: fix build against `gcc-13` Without the change build fails on `master` as https://hydra.nixos.org/build/247623778: [ 98%] Built target hmain_test In file included from /build/source/examples/mqtt/mqtt_client_test.cpp:10: /build/source/examples/../mqtt/mqtt_client.h: In member function 'int hv::MqttClient::publish(const std::string&, const std::string&, int, int, MqttCallback)': /build/source/examples/../mqtt/mqtt_client.h:232:25: error: invalid use of incomplete type 'const std::string' {aka 'const class std::__cxx11::basic_string'} 232 | msg.topic_len = topic.size(); | ^~~~~ --- pkgs/development/libraries/libhv/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libhv/default.nix b/pkgs/development/libraries/libhv/default.nix index 5975502f315b..e48b836b7cd7 100644 --- a/pkgs/development/libraries/libhv/default.nix +++ b/pkgs/development/libraries/libhv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, Security }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, Security }: stdenv.mkDerivation (finalAttrs: { pname = "libhv"; @@ -11,6 +11,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-tVuQwj2HvAhp51urGCuNPjBEIaTu9yR031Ih/5or9Pk="; }; + patches = [ + # Fix build failure on gcc-13: + # https://github.com/ithewei/libhv/pull/490 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/ithewei/libhv/commit/b3e61519fbdbbb956fed275c0a849ba5d4d6e45c.patch"; + hash = "sha256-fuYI+B3qZkSAbLZc0p6/0fnqaHx6w9N9vhTEE2t6UUs="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ curl openssl ] ++ lib.optional stdenv.isDarwin Security;