colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

firefox: remove dead code

Browse Source
This commit is contained in:
Colin
2024-09-02 13:29:11 +00:00
parent ab15d2a991
commit 90f7953615
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hosts/common/programs/firefox.nix
View File

@@ -13,14 +13,7 @@ let
mobile-prefs = lib.optionals false pkgs.librewolf-pmos-mobile.extraPrefsFiles; mobile-prefs = lib.optionals false pkgs.librewolf-pmos-mobile.extraPrefsFiles;
# allow easy switching between firefox and librewolf with `defaultSettings`, below # allow easy switching between firefox and librewolf with `defaultSettings`, below
librewolfSettings = { librewolfSettings = {
browser = pkgs.librewolf-unwrapped.overrideAttrs (upstream: { browser = pkgs.librewolf-unwrapped;
# TEMP(2023/11/21): fix eval bug in wrapFirefox
# see: <https://github.com/NixOS/nixpkgs/pull/244591>
passthru = upstream.passthru // {
requireSigning = false;
allowAddonSideload = true;
};
});
extraPrefsFiles = pkgs.librewolf-unwrapped.extraPrefsFiles ++ mobile-prefs; extraPrefsFiles = pkgs.librewolf-unwrapped.extraPrefsFiles ++ mobile-prefs;
libName = "librewolf"; libName = "librewolf";
dotDir = ".librewolf"; dotDir = ".librewolf";
@@ -199,7 +192,7 @@ let
in in
{ {
config = mkMerge [ config = mkMerge [
({ {
sane.programs.firefox.configOption = mkOption { sane.programs.firefox.configOption = mkOption {
type = types.submodule configOpts; type = types.submodule configOpts;
default = {}; default = {};
@@ -266,8 +259,8 @@ in
enable = lib.mkDefault true; enable = lib.mkDefault true;
}; };
}; };
}) }
({ {
sane.programs.firefox = { sane.programs.firefox = {
inherit packageUnwrapped; inherit packageUnwrapped;
sandbox.method = "bwrap"; # landlock works, but requires all of /proc to be linked sandbox.method = "bwrap"; # landlock works, but requires all of /proc to be linked
@@ -414,7 +407,6 @@ in
"ephemeral" "ephemeral"
; ;
}; };
}
})
]; ];
} }