git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #55119 from andir/firefox-wayland

Firefox add support for native wayland backend

commitc569643f4a654e40193d3ca12787feee1529a198 authorFlorian Klink <flokli@flokli.de> dateTue 12 Feb 2019, 00:45 (8 years ago) parent4d8e3a27eaef48
3 files changed+11−3
pkgs/applications/networking/browsers/firefox/common.nix+3−1 pkgs/applications/networking/browsers/firefox/wrapper.nix+7−2 pkgs/top-level/all-packages.nix+1
pkgs/applications/networking/browsers/firefox/common.nix+3−1
@@ -22,6 +22,7 @@
2222, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
2323, ffmpegSupport ? true
2424, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
25+, waylandSupport ? true, libxkbcommon
2526, gssSupport ? true, kerberos
2627
2728## privacy-related options
@@ -74,7 +75,7 @@ let
7475 flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
7576
7677 default-toolkit = if stdenv.isDarwin then "cairo-cocoa"
77− else "cairo-gtk${if gtk3Support then "3" else "2"}";
78+ else "cairo-gtk${if gtk3Support then "3${lib.optionalString waylandSupport "-wayland"}" else "2"}";
7879
7980 binaryName = if isIceCatLike then "icecat" else "firefox";
8081 binaryNameCapitalized = lib.toUpper (lib.substring 0 1 binaryName) + lib.substring 1 (-1) binaryName;
@@ -124,6 +125,7 @@ stdenv.mkDerivation rec {
124125 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
125126 ++ lib.optional gtk3Support gtk3
126127 ++ lib.optional gssSupport kerberos
128+ ++ lib.optional waylandSupport libxkbcommon
127129 ++ lib.optionals stdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos
128130 AVFoundation MediaToolbox CoreLocation
129131 Foundation libobjc AddressBook cups ];
pkgs/applications/networking/browsers/firefox/wrapper.nix+7−2
@@ -26,8 +26,11 @@ let
2626 , icon ? browserName
2727 , extraPlugins ? []
2828 , extraNativeMessagingHosts ? []
29+ , gdkWayland ? false
2930 }:
3031
32+ assert gdkWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used
33+
3134 let
3235 cfg = config.${browserName} or {};
3336 enableAdobeFlash = cfg.enableAdobeFlash or false;
@@ -86,7 +89,7 @@ let
8689 exec = "${browserName}${nameSuffix} %U";
8790 inherit icon;
8891 comment = "";
89− desktopName = "${desktopName}${nameSuffix}";
92+ desktopName = "${desktopName}${nameSuffix}${lib.optionalString gdkWayland " (Wayland)"}";
9093 genericName = "Web Browser";
9194 categories = "Application;Network;WebBrowser;";
9295 mimeType = stdenv.lib.concatStringsSep ";" [
@@ -124,7 +127,9 @@ let
124127 --suffix PATH ':' "$out${browser.execdir or "/bin"}" \
125128 --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
126129 --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
127− ${lib.optionalString (browser ? gtk3)
130+ ${lib.optionalString gdkWayland ''
131+ --set GDK_BACKEND "wayland" \
132+ ''}${lib.optionalString (browser ? gtk3)
128133 ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
129134 --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share'
130135 ''
pkgs/top-level/all-packages.nix+1
@@ -17240,6 +17240,7 @@ in
1724017240 icecat-unwrapped = firefoxPackages.icecat;
1724117241
1724217242 firefox = wrapFirefox firefox-unwrapped { };
17243+ firefox-wayland = wrapFirefox firefox-unwrapped { gdkWayland = true; };
1724317244 firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { };
1724417245 firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { };
1724517246 firefox-esr = firefox-esr-60;