From ef13a2129b59d21410ea04a5fc2e9e26559aa43a Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Tue, 9 Feb 2021 10:39:04 -0800 Subject: [PATCH] libglvnd: disable asm on aarch64-darwin libglvnd itself doesn't know about `aarch64-darwin`, so it tries to use assembly that is not supported by mach-o, failing as a result. --- pkgs/development/libraries/libglvnd/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 1ef63c2406d..3124486f07a 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -35,8 +35,11 @@ stdenv.mkDerivation rec { "-Wno-error=array-bounds" ] ++ lib.optional stdenv.cc.isClang "-Wno-error"); - # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 - configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; + configureFlags = [] + # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 + ++ lib.optional stdenv.hostPlatform.isMusl "--disable-tls" + # Remove when aarch64-darwin asm support is upstream: https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/216 + ++ lib.optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "--disable-asm"; outputs = [ "out" "dev" ];