From f2e5f0a559b9806d40515b2345e3b1518f5a15c9 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 25 Apr 2025 12:45:11 -0700 Subject: [PATCH] screen: fix building with llvm --- pkgs/tools/misc/screen/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 7d32d467bfc1..5079345becfd 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; # We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416 - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU) "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types"; + NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types"; patches = [ # GNU Screen 5.0 uses strncpy incorrectly in SendCmdMessage @@ -43,7 +43,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.hostPlatform.isDarwin utmp; # The test suite seems to have some glibc malloc hooks that don't exist/link on macOS - doCheck = !stdenv.hostPlatform.isDarwin; + # With pkgsLLVM: tests/test-winmsgcond.c:53: assertion 'wmc_end(&wmc, pos + 1, &chg) == pos' failed + doCheck = !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.useLLVM; meta = with lib; { homepage = "https://www.gnu.org/software/screen/";