Unverified Commit 76c97a05 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #235912 from kxxt/firefox-devedition/patch-1

firefox-*: change binary name and desktop entry
parents 095dec04 d7bccab0
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m

  `CONFIG_FILE_NAME` includes `bpf_pinning`, `ematch_map`, `group`, `nl_protos`, `rt_dsfield`, `rt_protos`, `rt_realms`, `rt_scopes`, and `rt_tables`.

- The executable file names for `firefox-devedition`, `firefox-beta`, `firefox-esr` now matches their package names, which is consistent with the `firefox-*-bin` packages. The desktop entries are also updated so that you can have multiple editions of firefox in your app launcher.

- The `systemd.oomd` module behavior is changed as:

  - Raise ManagedOOMMemoryPressureLimit from 50% to 80%. This should make systemd-oomd kill things less often, and fix issues like [this](https://pagure.io/fedora-workstation/issue/358).
+18 −3
Original line number Diff line number Diff line
@@ -31874,13 +31874,28 @@ with pkgs;
  firefox-esr-unwrapped = firefoxPackages.firefox-esr-115;
  firefox = wrapFirefox firefox-unwrapped { };
  firefox-beta = wrapFirefox firefox-beta-unwrapped { };
  firefox-devedition = wrapFirefox firefox-devedition-unwrapped { };
  firefox-beta = wrapFirefox firefox-beta-unwrapped {
    nameSuffix = "-beta";
    desktopName = "Firefox Beta";
    wmClass = "firefox-beta";
    icon = "firefox-beta";
  };
  firefox-devedition = wrapFirefox firefox-devedition-unwrapped {
    nameSuffix = "-devedition";
    desktopName = "Firefox Developer Edition";
    wmClass = "firefox-devedition";
    icon = "firefox-devedition";
  };
  firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { };
  firefox-esr = firefox-esr-115;
  firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { };
  firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped {
    nameSuffix = "-esr";
    desktopName = "Firefox ESR";
    wmClass = "firefox-esr";
    icon = "firefox-esr";
  };
  firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
    inherit (gnome) adwaita-icon-theme;