From 78c74c1e0504cc1df4bd8edd124d7d4bebce81cb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 24 Dec 2023 23:35:34 +0000 Subject: [PATCH] hfst-ospell: pull upstream fix for gcc-13 compatibility Without the change `hfst-ospell` fails build on `staging-next` as: hfst-ol.h:39:9: error: 'uint16_t' does not name a type 39 | typedef uint16_t SymbolNumber; | ^~~~~~~~ hfst-ol.h:35:1: note: 'uint16_t' is defined in header ''; did you forget to '#include '? 34 | #include +++ |+#include 35 | #include "ol-exceptions.h" hfst-ol.h:40:9: error: 'uint32_t' does not name a type 40 | typedef uint32_t TransitionTableIndex; | ^~~~~~~~ --- pkgs/development/libraries/hfst-ospell/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/hfst-ospell/default.nix b/pkgs/development/libraries/hfst-ospell/default.nix index ad07025cc35d..f0a0bc6bef48 100644 --- a/pkgs/development/libraries/hfst-ospell/default.nix +++ b/pkgs/development/libraries/hfst-ospell/default.nix @@ -2,6 +2,7 @@ , stdenv , autoreconfHook , fetchFromGitHub +, fetchpatch , icu , libarchive , pkg-config @@ -18,6 +19,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-16H1nbAIe+G71+TnlLG0WnH9LktZwmc0d0O+oYduH1k="; }; + patches = [ + # Pull upstream fix for gcc-13 + (fetchpatch { + name = "cstdint.patch"; + url = "https://github.com/hfst/hfst-ospell/commit/7481bffbf622bc9aee3547183fbe8db9cf8b22ce.patch"; + hash = "sha256-q/B5mLx8Oc0nIRe3n3gl0OTyjIaEMCBsPc1GvpE226c="; + }) + ]; + buildInputs = [ icu libarchive