diff options
| author | éclairevoyant <848000+eclairevoyant@users.noreply.github.com> | 2024-06-18 02:12:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-18 02:12:46 +0000 |
| commit | 31e107dc564e53cf2843bedf6a8b85faa2f845e3 (patch) | |
| tree | a62f0ae76e66ac56021772094ad1473a19125b99 /pkgs/applications/networking/instant-messengers | |
| parent | ccef14f15a1549e2caef362aa7f506b0b7e55961 (diff) | |
| parent | 1fb71839a2fee231ebeac1facb5bdc3763c47c5c (diff) | |
Merge pull request #318039 from pluiedev/fix/feishu-on-wayland
feishu: do not use native Wayland even when NIXOS_OZONE_WL is set
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 67d875ca7a94b..d43320558b2a8 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 |