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

mesa, libglvnd, xorg: disable tls w/musl

Browse Source
This commit is contained in:
Will Dietz 2018-04-03 16:45:43 -05:00
parent 3f42a6eb84
commit 64c2e058e6
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/libglvnd/default.nix
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\"" "-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. # Upstream patch fixing use of libdl, should be in next release.
patches = [ patches = [
(fetchpatch { (fetchpatch {

3
pkgs/development/libraries/mesa/default.nix
View File

@ -125,7 +125,8 @@ let self = stdenv.mkDerivation {
"--enable-gles1" "--enable-gles1"
"--enable-gles2" "--enable-gles2"
"--enable-glx" "--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-gallium-osmesa" # used by wine
"--enable-llvm" "--enable-llvm"
"--enable-egl" "--enable-egl"

2
pkgs/servers/x11/xorg/overrides.nix
View File

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