summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-04-03 16:45:43 -0500
committerWill Dietz <w@wdtz.org>2018-04-24 17:16:22 -0500
commit64c2e058e678303ca8b23c68f5011b6dda9dc319 (patch)
tree399773467d6d0cd4e5331060ead6ac61a6c15e04 /pkgs/servers/x11
parent3f42a6eb84cfc56790c1347f081551650f7701f3 (diff)
downloadnixpkgs-64c2e058e678303ca8b23c68f5011b6dda9dc319.tar
nixpkgs-64c2e058e678303ca8b23c68f5011b6dda9dc319.tar.gz
nixpkgs-64c2e058e678303ca8b23c68f5011b6dda9dc319.tar.bz2
nixpkgs-64c2e058e678303ca8b23c68f5011b6dda9dc319.tar.lz
nixpkgs-64c2e058e678303ca8b23c68f5011b6dda9dc319.tar.xz
nixpkgs-64c2e058e678303ca8b23c68f5011b6dda9dc319.tar.zst
nixpkgs-64c2e058e678303ca8b23c68f5011b6dda9dc319.zip
mesa, libglvnd, xorg: disable tls w/musl
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/overrides.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 55eb54622d5..5efa4bfcfd5 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -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