about summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2023-12-31 15:22:28 +0100
committerVladimír Čunát <v@cunat.cz>2023-12-31 15:22:28 +0100
commitbfb057546cb8e77576f0c6d59280d6d25a33cf40 (patch)
treefe2cf3d72255e605232ac9d3476b49989066665d /pkgs/misc
parentb297ecacbd4f8e3d2631388a365c143fddec175d (diff)
parent2777f2e4582b79a366cef66b415c799362427344 (diff)
Merge #276802: hdt: fix gcc-13 build failure
...into staging-next
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/hdt/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/misc/hdt/default.nix b/pkgs/misc/hdt/default.nix
index 9e1efd5f836d2..e7c46d78588dd 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 ];