diff options
| author | Cole Mickens <cole.mickens@gmail.com> | 2020-07-06 23:21:03 -0700 |
|---|---|---|
| committer | Cole Mickens <cole.mickens@gmail.com> | 2020-07-07 03:33:44 -0700 |
| commit | 8734a5e362aad7668e528de0d1defa5b6bcd1529 (patch) | |
| tree | c1dfd9a1c77db4a2e37217b03953f4ce3648630c /pkgs/applications/networking/browsers/firefox | |
| parent | fc553c0bc5411478e2448a707f74369ae9351e96 (diff) | |
firefox: wrapper: gdkWayland->forceWayland
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 9e7e4bc5efa2..6e6c1f75b75d 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -26,11 +26,11 @@ let , nameSuffix ? "" , icon ? browserName , extraNativeMessagingHosts ? [] - , gdkWayland ? false + , forceWayland ? false , cfg ? config.${browserName} or {} }: - assert gdkWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used + assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used let enableAdobeFlash = cfg.enableAdobeFlash or false; @@ -83,7 +83,7 @@ let exec = "${browserName}${nameSuffix} %U"; inherit icon; comment = ""; - desktopName = "${desktopName}${nameSuffix}${lib.optionalString gdkWayland " (Wayland)"}"; + desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; genericName = "Web Browser"; categories = "Network;WebBrowser;"; mimeType = stdenv.lib.concatStringsSep ";" [ @@ -124,8 +124,8 @@ let --set SNAP_NAME "firefox" \ --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ - ${lib.optionalString gdkWayland '' - --set GDK_BACKEND "wayland" \ + ${lib.optionalString forceWayland '' + --set MOZ_ENABLE_WAYLAND "1" \ ''}${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' |