Unverified Commit 35abc090 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #245458 from vale981/patch-1 

mathematica: enable wayland support
parents 3241fa07 ff73ec1d

pkgs/applications/science/math/mathematica/generic.nix

+3 −2
Original line number Diff line number Diff line
@@ -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"