diff options
| author | Will Dietz <w@wdtz.org> | 2018-04-24 19:58:44 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-04-24 19:58:44 -0500 |
| commit | f07f0c6009bb4c2653350fac8db2eee29e09bd1b (patch) | |
| tree | 6d5af636871d77e964ece378d93fbc914561aff2 /pkgs/development/libraries/mesa/default.nix | |
| parent | 4b2f3971981272b79da7f87b639ca8854a6ea89c (diff) | |
| parent | 7e33e374db487ed87db316db3b2687f917aa7f90 (diff) | |
| download | nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.tar nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.tar.gz nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.tar.bz2 nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.tar.lz nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.tar.xz nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.tar.zst nixlib-f07f0c6009bb4c2653350fac8db2eee29e09bd1b.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/development/libraries/mesa/default.nix')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index fae83a95f3ca..1033c87b54c3 100644 --- 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" |