diff options
| author | Will Dietz <github@wdtz.org> | 2018-04-24 17:17:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-24 17:17:23 -0500 |
| commit | 7139c65c88bb24095fac1af34a1e4780eb224dfd (patch) | |
| tree | a09e28c4f4a4e15b39e916d60717c01094aef5d3 /pkgs/development | |
| parent | dfcae92929bd0c0b4f9f459ce4cd3d178fc74a4a (diff) | |
| parent | 64c2e058e678303ca8b23c68f5011b6dda9dc319 (diff) | |
| download | nixlib-7139c65c88bb24095fac1af34a1e4780eb224dfd.tar nixlib-7139c65c88bb24095fac1af34a1e4780eb224dfd.tar.gz nixlib-7139c65c88bb24095fac1af34a1e4780eb224dfd.tar.bz2 nixlib-7139c65c88bb24095fac1af34a1e4780eb224dfd.tar.lz nixlib-7139c65c88bb24095fac1af34a1e4780eb224dfd.tar.xz nixlib-7139c65c88bb24095fac1af34a1e4780eb224dfd.tar.zst nixlib-7139c65c88bb24095fac1af34a1e4780eb224dfd.zip | |
Merge pull request #39441 from dtzWill/fix/libgl-tls-musl
mesa, libglvnd, xorg: disable tls w/musl
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libglvnd/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 4bc1d1addcfb..7e1a2b549681 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -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 { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index e77a4e1414e9..a3c03c4f2e53 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" |