From 2777f2e4582b79a366cef66b415c799362427344 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 25 Dec 2023 23:02:07 +0000 Subject: [PATCH] hdt: fix `gcc-13` build failure Without the change build fails on `gcc-13` on `staging-next` as: src/util/StopWatch.cpp: In static member function 'static std::string StopWatch::toHuman(long long unsigned int)': src/util/StopWatch.cpp:166:5: error: 'uint64_t' was not declared in this scope 166 | uint64_t tot_secs = time/1000000; | ^~~~~~~~ src/util/StopWatch.cpp:36:1: note: 'uint64_t' is defined in header ''; did you forget to '#include '? 35 | #include "StopWatch.hpp" +++ |+#include --- pkgs/misc/hdt/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/hdt/default.nix b/pkgs/misc/hdt/default.nix index 9e1efd5f836d..e7c46d78588d 100644 --- a/pkgs/misc/hdt/default.nix +++ b/pkgs/misc/hdt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config, zlib, serd }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libtool, pkg-config, zlib, serd }: stdenv.mkDerivation rec { pname = "hdt"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1vsq80jnix6cy78ayag7v8ajyw7h8dqyad1q6xkf2hzz3skvr34z"; }; + patches = [ + # Pull fix for gcc-13 compatibility pending upstream inclusion: + # https://github.com/rdfhdt/hdt-cpp/pull/276 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/rdfhdt/hdt-cpp/commit/1b775835c6661c67cb18f5d6f65638ba7d4ecf3c.patch"; + hash = "sha256-2ppcA+Ztw5G/buW2cwCNbuGeUuvgvSruW3OarWNCIHI="; + }) + ]; + buildInputs = [ zlib serd ]; nativeBuildInputs = [ autoreconfHook libtool pkg-config ];