Merge pull request #73365 from colemickens/nixpkgs-firefox-libglvnd
firefox-wrapper: rename gdkWayland->forceWayland; always use libglvnd
This commit is contained in:
commit
1b78e0eeec
@ -27,11 +27,12 @@ let
|
||||
, nameSuffix ? ""
|
||||
, icon ? browserName
|
||||
, extraNativeMessagingHosts ? []
|
||||
, gdkWayland ? false
|
||||
, forceWayland ? false
|
||||
, useGlvnd ? true
|
||||
, 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;
|
||||
@ -69,7 +70,7 @@ let
|
||||
libs = lib.optionals stdenv.isLinux [ udev libva mesa ]
|
||||
++ lib.optional ffmpegSupport ffmpeg
|
||||
++ lib.optional gssSupport kerberos
|
||||
++ lib.optional gdkWayland libglvnd
|
||||
++ lib.optional useGlvnd libglvnd
|
||||
++ lib.optionals (cfg.enableQuakeLive or false)
|
||||
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
|
||||
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
|
||||
@ -84,7 +85,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 ";" [
|
||||
@ -125,8 +126,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'
|
||||
|
@ -19934,7 +19934,7 @@ in
|
||||
firefox-unwrapped = firefoxPackages.firefox;
|
||||
firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68;
|
||||
firefox = wrapFirefox firefox-unwrapped { };
|
||||
firefox-wayland = wrapFirefox firefox-unwrapped { gdkWayland = true; };
|
||||
firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; };
|
||||
firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { };
|
||||
firefox-esr = firefox-esr-68;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user