public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #113751 from bobrik/ivan/libglvnd-aarch64-darwin

Browse Source 
libglvnd: disable asm on aarch64-darwin
This commit is contained in:
Michael Weiss 2021-02-26 19:50:34 +01:00 committed by GitHub
commit 24e89ccb75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/libglvnd/default.nix
View File

@ -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" ];