From 703c3208defc72625553ecaae1e3f948adbf339e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 24 Jan 2024 21:27:06 +0100 Subject: [PATCH] pkgsStatic.libunwind: don't -mno-outline-atomics The build failure this was added to fix doesn't happen for static builds. --- pkgs/development/libraries/libunwind/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 9060b7d0393b..cae3ebed89f6 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # prebuilt in the source tarball. configureFlags = [ "LATEX2MAN=${buildPackages.coreutils}/bin/true" ] # See https://github.com/libunwind/libunwind/issues/693 - ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl) [ + ++ lib.optionals (with stdenv.hostPlatform; isAarch64 && isMusl && !isStatic) [ "CFLAGS=-mno-outline-atomics" ];