From 45e2426453f3e43271fae4b2e1b94adfb995b44c Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 1 Jan 2025 13:02:58 +0000 Subject: [PATCH] boost{177,178,179,180,181,182,183}: conditionalize stacktrace flag This library was introduced in Boost 1.85. Fixes: 3e2ceab20157c37566df2f2ea35d4a6dac95732c --- pkgs/development/libraries/boost/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 91009c02167e..b3bd289c5ade 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -89,6 +89,8 @@ let "link=${link}" "-sEXPAT_INCLUDE=${expat.dev}/include" "-sEXPAT_LIBPATH=${expat.out}/lib" + ] + ++ lib.optionals (lib.versionAtLeast version "1.85") [ ( # The stacktrace from exception feature causes memory leaks when built # with libc++. For all other standard library implementations, i.e. @@ -99,9 +101,8 @@ let else "define=BOOST_STACKTRACE_LIBCXX_RUNTIME_MAY_CAUSE_MEMORY_LEAK" ) - - # TODO: make this unconditional ] + # TODO: make this unconditional ++ lib.optionals (