diff options
| author | Ivan Babrou <github@ivan.computer> | 2021-02-09 10:39:04 -0800 |
|---|---|---|
| committer | Ivan Babrou <github@ivan.computer> | 2021-02-26 09:45:13 -0800 |
| commit | ef13a2129b59d21410ea04a5fc2e9e26559aa43a (patch) | |
| tree | 331d84a0d9ec7acfc2b5169a22ffc1e4594d31c8 /pkgs/development/libraries/libglvnd | |
| parent | 3a2195b7501762b6f218aeb0b9090b4a22d82306 (diff) | |
| download | nixpkgs-ef13a2129b59d21410ea04a5fc2e9e26559aa43a.tar nixpkgs-ef13a2129b59d21410ea04a5fc2e9e26559aa43a.tar.gz nixpkgs-ef13a2129b59d21410ea04a5fc2e9e26559aa43a.tar.bz2 nixpkgs-ef13a2129b59d21410ea04a5fc2e9e26559aa43a.tar.lz nixpkgs-ef13a2129b59d21410ea04a5fc2e9e26559aa43a.tar.xz nixpkgs-ef13a2129b59d21410ea04a5fc2e9e26559aa43a.tar.zst nixpkgs-ef13a2129b59d21410ea04a5fc2e9e26559aa43a.zip | |
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.
Diffstat (limited to 'pkgs/development/libraries/libglvnd')
| -rw-r--r-- | pkgs/development/libraries/libglvnd/default.nix | 7 |
1 files 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" ]; |