Merge remote-tracking branch 'origin/master' into staging

2018-04-24 19:58:44 -05:00
parent 4b2f397198 7e33e374db
commit f07f0c6009
33 changed files with 1518 additions and 83 deletions
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -125,7 +125,8 @@ let self = stdenv.mkDerivation {
    "--enable-gles1"
    "--enable-gles2"
    "--enable-glx"
-    "--enable-glx-tls"
+    # https://bugs.freedesktop.org/show_bug.cgi?id=35268
+    (enableFeature (!stdenv.hostPlatform.isMusl) "glx-tls")
    "--enable-gallium-osmesa" # used by wine
    "--enable-llvm"
    "--enable-egl"