diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-11-18 10:48:55 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-11-18 10:49:22 +0100 |
commit | 8ab030e8de776b6f2df52d901800db5854c57319 (patch) | |
tree | b1852eda1c0e53bc87e6b45a4d8f7336d01f90e4 /pkgs/applications/networking/browsers | |
parent | 9877b3d32263d5898476abb9fdec4e8308261bb6 (diff) | |
parent | c156bdf40d2f0e64b574ade52c5611d90a0b6273 (diff) |
Merge #201359: firefox, thunderbird, librewolf: Enable wayland support by default
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 963028ae321a2..378fe1f4039b0 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -33,7 +33,6 @@ let , wmClass ? null , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] - , forceWayland ? false , useGlvnd ? true , cfg ? config.${applicationName} or {} @@ -170,7 +169,7 @@ let name = applicationName; exec = "${launcherName} %U"; inherit icon; - desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; + desktopName = "${desktopName}${nameSuffix}"; startupNotify = true; startupWMClass = wmClass; terminal = false; @@ -309,7 +308,7 @@ let --set MOZ_ALLOW_DOWNGRADE 1 \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ - ${lib.optionalString forceWayland "--set MOZ_ENABLE_WAYLAND 1"} \ + --set-default MOZ_ENABLE_WAYLAND 1 \ "''${oldWrapperArgs[@]}" ############################# # # |