Merge pull request #245458 from vale981/patch-1

mathematica: enable wayland support

authored by

Nick Cao and committed by
GitHub
35abc090 3241fa07

+3 -2
+3 -2
pkgs/applications/science/math/mathematica/generic.nix
··· 125 125 "--set USE_WOLFRAM_LD_LIBRARY_PATH 1" 126 126 # Fix xkeyboard config path for Qt 127 127 "--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" 128 - # wayland isn't supported 129 - "--set QT_QPA_PLATFORM xcb" 128 + # if wayland isn't supported we fail over to xcb 129 + # see https://github.com/qt/qtbase/blob/35d0f012ee9b95e8cf3563a41d710ff3c023d841/src/gui/kernel/qguiapplication.cpp#L1218 130 + "--set QT_QPA_PLATFORM wayland;xcb" 130 131 ] ++ lib.optionals cudaSupport [ 131 132 "--set CUDA_PATH ${cudaEnv}" 132 133 "--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so"