From c8b54a3b4c668a3039b299b7895ab8b3e2e43233 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 29 May 2026 05:11:22 +0000 Subject: [PATCH] umockdev: fix musl build fixes: - pkgsMusl.umockdev - pkgsCross.musl64.umockdev --- pkgs/by-name/um/umockdev/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/um/umockdev/package.nix b/pkgs/by-name/um/umockdev/package.nix index 96484e269461..c7a1357dbddc 100644 --- a/pkgs/by-name/um/umockdev/package.nix +++ b/pkgs/by-name/um/umockdev/package.nix @@ -84,12 +84,17 @@ stdenv.mkDerivation (finalAttrs: { "-Dgtk_doc=true" ]; - doCheck = true; + # glibc valgrind can't measure musl binaries (and vice versa) + doCheck = stdenv.hostPlatform.libc == stdenv.buildPlatform.libc; postPatch = '' # Substitute the path to this derivation in the patch we apply. substituteInPlace src/umockdev-wrapper \ --subst-var-by 'LIBDIR' "''${!outputLib}/lib" + '' + + lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace src/libumockdev-preload.c \ + --replace-fail libc.so.6 libc.so ''; preCheck = ''