3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #39441 from dtzWill/fix/libgl-tls-musl

mesa, libglvnd, xorg: disable tls w/musl
This commit is contained in:
Will Dietz 2018-04-24 17:17:23 -05:00 committed by GitHub
commit 7139c65c88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions

View file

@ -22,6 +22,9 @@ in stdenv.mkDerivation rec {
"-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\""
];
# Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268
configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls";
# Upstream patch fixing use of libdl, should be in next release.
patches = [
(fetchpatch {

View file

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

View file

@ -512,6 +512,8 @@ in
"--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
"--with-xkb-output=$out/share/X11/xkb/compiled"
"--enable-glamor"
] ++ lib.optionals stdenv.hostPlatform.isMusl [
"--disable-tls"
];
postInstall = ''
rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it