diff options
| author | Leah Amelia Chen <hi@pluie.me> | 2024-06-07 17:45:47 +0200 |
|---|---|---|
| committer | Leah Amelia Chen <hi@pluie.me> | 2024-06-17 23:23:34 +0200 |
| commit | 1fb71839a2fee231ebeac1facb5bdc3763c47c5c (patch) | |
| tree | bea497e9a714c276792ed7905ace55316ac9ee75 /pkgs/applications/networking/instant-messengers | |
| parent | d226935fd75012939397c83f6c385e4d6d832288 (diff) | |
feishu: do not use native Wayland even when NIXOS_OZONE_WL is set
It just crashes when the Ozone platform is set to Wayland instead of X11. Oops! Fixes #318035
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/feishu/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 48a6ba12d1826..d835b5b60d99a 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -176,10 +176,10 @@ stdenv.mkDerivation { # Wrap feishu and vulcan # Feishu is the main executable, vulcan is the builtin browser for executable in $out/opt/bytedance/feishu/{feishu,vulcan/vulcan}; do + # FIXME: Add back NIXOS_OZONE_WL support once upstream fixes the crash on native Wayland (see #318035) wrapProgram $executable \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu:${addOpenGLRunpath.driverLink}/share \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ ${lib.optionalString (commandLineArgs!="") "--add-flags ${lib.escapeShellArg commandLineArgs}"} done |