From 8cd25658f68dc874cf866429b8537c6c599b8ac8 Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Fri, 9 May 2025 18:13:46 +0200 Subject: [PATCH] t4kcommon: add u8_mbtouc_unsafe workaround Building it was failing with: /build/source/src/linebreak/linebreak.c: In function 'u8_possible_linebreaks': /build/source/src/linebreak/linebreak.c:163:19: error: implicit declaration of function 'u8_mbtouc_unsafe' [] 163 | int count = u8_mbtouc_unsafe (&uc, s, s_end - s); | ^~~~~~~~~~~~~~~~ --- pkgs/by-name/t4/t4kcommon/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/t4/t4kcommon/package.nix b/pkgs/by-name/t4/t4kcommon/package.nix index d5e07eb4bbde..17ee971bc351 100644 --- a/pkgs/by-name/t4/t4kcommon/package.nix +++ b/pkgs/by-name/t4/t4kcommon/package.nix @@ -38,8 +38,7 @@ stdenv.mkDerivation rec { # gcc-10. Otherwise build fails as: # ld: CMakeFiles/t4k_common.dir/t4k_throttle.c.o:(.bss+0x0): multiple definition of # `wrapped_lines'; CMakeFiles/t4k_common.dir/t4k_audio.c.o:(.bss+0x0): first defined here - # TODO: revisit https://github.com/tux4kids/t4kcommon/pull/10 when merged. - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon -DGNULIB_UNISTR_U8_MBTOUC_UNSAFE -Wno-incompatible-pointer-types"; nativeBuildInputs = [ cmake