Skip to content

libui-ng: fix tests with cmocka 2 #478521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mindavi merged 1 commit into from
Jan 13, 2026
Merged

libui-ng: fix tests with cmocka 2 #478521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions pkgs/by-name/li/libui-ng/0001-Remove-cm_print_error-declaration.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From 5bfab42bc531e40d99ea88a1fb7662c8388ee833 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 9 Jan 2026 21:23:39 +0100
Subject: [PATCH] Remove cm_print_error declaration

With CMocka 2.0.0 this `cm_print_error` is now a macro so using it as
a function name causes syntax errors. I've checked that 1.1.8 has this
declaration in `cmocka.h` header so it seems to no longer be needed even
with the older version.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
test/unit/drawmatrix.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/test/unit/drawmatrix.c b/test/unit/drawmatrix.c
index 2e263fc0..49623388 100644
--- a/test/unit/drawmatrix.c
+++ b/test/unit/drawmatrix.c
@@ -15,9 +15,6 @@ static int compareDouble(double a, double b, double epsilon)
return diff <= epsilon * eps_scale;
}

-// It's not defined in cmocka.h but exists in cmocka.c
-void cm_print_error(const char * const format, ...);
-
// Check if a == b without aborting the test.
static int expectDoubleEqual(double a, double b, int first_error, const char* error_prefix)
{
--
2.52.0

3 changes: 3 additions & 0 deletions pkgs/by-name/li/libui-ng/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ stdenv.mkDerivation {

patches = [
./darwin-no-universal.patch

# https://github.com/libui-ng/libui-ng/pull/348
./0001-Remove-cm_print_error-declaration.patch
Copy link
Contributor

@Mindavi Mindavi Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using fetchpatch(2) is preferred for this, I'd say.

Copy link
Member

@dotlambda dotlambda Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, the patch is supposed to be vendored in this case:

When adding patches in this manner you should be reasonably sure that the used URL is stable. Patches referencing open pull requests will change when the PR is updated and code forges (such as GitHub) usually garbage collect commits that are no longer reachable due to rebases/amends.1

Footnotes

  1. https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#fetching-patches ↩

];

nativeBuildInputs = [
Expand Down
Loading