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

librewolf: work toward upstreaming the MOZ_REQUIRE_SIGNING patch

Browse Source
This commit is contained in:
colin
2022-11-02 02:39:56 -07:00
parent f6e4c0058c
commit b559d334c3
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/universal/home-manager/firefox.nix
View File

@@ -12,10 +12,11 @@ let
cfg = config.sane.web-browser; cfg = config.sane.web-browser;
# 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 (drv: { browser = pkgs.librewolf-unwrapped;
# this allows side-loading unsigned addons # browser = pkgs.librewolf-unwrapped.overrideAttrs (drv: {
MOZ_REQUIRE_SIGNING = false; # # this allows side-loading unsigned addons
}); # MOZ_REQUIRE_SIGNING = false;
# });
libName = "librewolf"; libName = "librewolf";
dotDir = ".librewolf"; dotDir = ".librewolf";
desktop = "librewolf.desktop"; desktop = "librewolf.desktop";
@@ -26,7 +27,8 @@ let
dotDir = ".mozilla/firefox"; dotDir = ".mozilla/firefox";
desktop = "firefox.desktop"; desktop = "firefox.desktop";
}; };
defaultSettings = firefoxSettings; # defaultSettings = firefoxSettings;
defaultSettings = librewolfSettings;
package = pkgs.wrapFirefox cfg.browser { package = pkgs.wrapFirefox cfg.browser {
# inherit the default librewolf.cfg # inherit the default librewolf.cfg

8
nixpatches/list.nix
View File

@@ -1,11 +1,17 @@
fetchpatch: [ fetchpatch: [
# phosh-mobile-settings: init at 0.21.1 # phosh-mobile-settings: init at 0.21.1
(fetchpatch { (fetchpatch {
url = "http://git.uninsane.org/colin/nixpkgs/commit/0c1a7e8504291eb0076bbee3f8ebf693f4641112.diff"; url = "https://git.uninsane.org/colin/nixpkgs/commit/0c1a7e8504291eb0076bbee3f8ebf693f4641112.diff";
# url = "https://github.com/NixOS/nixpkgs/pull/193845.diff"; # url = "https://github.com/NixOS/nixpkgs/pull/193845.diff";
sha256 = "sha256-OczjlQcG7sTM/V9Y9VL/qdwaWPKfjAJsh3czqqhRQig="; sha256 = "sha256-OczjlQcG7sTM/V9Y9VL/qdwaWPKfjAJsh3czqqhRQig=";
}) })
# librewolf: build with `MOZ_REQUIRE_SIGNING=false`
(fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/199134.diff";
# url = "https://git.uninsane.org/colin/nixpkgs/commit/99b82e07fee4d194520d6e8d51bc45c80a4d3c7e.diff";
sha256 = "sha256-FOAZYaMpSPMYwU26xYD+V/f+df0JjlbuVtqjlcBFW5Q=";
})
# # kaiteki: init at 2022-09-03 # # kaiteki: init at 2022-09-03
# vendorHash changes too frequently (might not be reproducible). # vendorHash changes too frequently (might not be reproducible).