Merge pull request #245458 from vale981/patch-1

mathematica: enable wayland support
This commit is contained in:
Nick Cao 2023-07-27 20:41:19 -06:00 committed by GitHub
commit 35abc09040
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -125,8 +125,9 @@ in stdenv.mkDerivation {
"--set USE_WOLFRAM_LD_LIBRARY_PATH 1"
# Fix xkeyboard config path for Qt
"--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb"
# wayland isn't supported
"--set QT_QPA_PLATFORM xcb"
# if wayland isn't supported we fail over to xcb
# see https://github.com/qt/qtbase/blob/35d0f012ee9b95e8cf3563a41d710ff3c023d841/src/gui/kernel/qguiapplication.cpp#L1218
"--set QT_QPA_PLATFORM wayland;xcb"
] ++ lib.optionals cudaSupport [
"--set CUDA_PATH ${cudaEnv}"
"--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so"