From e43c53cfc11b8ea55791429e22280783f840fe4d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 4 Feb 2025 15:37:35 +0100 Subject: [PATCH] kbd: fix cross compilation to musl Assume that malloc works properly if cross compiling. --- pkgs/by-name/kb/kbd/package.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix index 4bf9cb4325b9..c85e05fc552f 100644 --- a/pkgs/by-name/kb/kbd/package.nix +++ b/pkgs/by-name/kb/kbd/package.nix @@ -33,11 +33,16 @@ stdenv.mkDerivation rec { "dev" ]; - configureFlags = [ - "--enable-optional-progs" - "--enable-libkeymap" - "--disable-nls" - ]; + configureFlags = + [ + "--enable-optional-progs" + "--enable-libkeymap" + "--disable-nls" + ] + ++ lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; patches = [ ./search-paths.patch