librist: fix build for musl

(cherry picked from commit 01fe6fb38d)
This commit is contained in:
Alyssa Ross 2024-11-11 17:58:14 +01:00 committed by github-actions[bot]
parent 6163f20b37
commit 055e702400
2 changed files with 18 additions and 0 deletions

View File

@ -0,0 +1,16 @@
diff --git a/test/rist/unit/srp_examples.c b/test/rist/unit/srp_examples.c
index 1c5193d..6f835b5 100644
--- a/test/rist/unit/srp_examples.c
+++ b/test/rist/unit/srp_examples.c
@@ -16,6 +16,11 @@
#define DEBUG_USE_EXAMPLE_CONSTANTS 1
#if HAVE_MBEDTLS
+// musl's sched.h includes a prototype for calloc, so we need to make
+// sure it's already been included before we redefine it to something
+// that won't expand to a valid prototype.
+#include <sched.h>
+
#define malloc(size) _test_malloc(size, __FILE__, __LINE__)
#define calloc(num, size) _test_calloc(num, size, __FILE__, __LINE__)
#define free(obj) _test_free(obj, __FILE__, __LINE__)

View File

@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
patches = [
# https://github.com/NixOS/nixpkgs/pull/257020
./darwin.patch
# https://code.videolan.org/rist/librist/-/merge_requests/257
./musl.patch
];
nativeBuildInputs = [