From 759a7cc50e170a1137bb172559b961fa657ecb8a Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sat, 25 Nov 2023 01:53:53 -0500
Subject: [PATCH 1/2] buildMozillaMach: passthru
requireSigning/allowAddonSideload
Fixes wrapper-installed addons, which previously rejected valid browser configurations
---
pkgs/applications/networking/browsers/firefox/common.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 5542ca62b93a..a35963bbdd41 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -568,6 +568,7 @@ buildStdenv.mkDerivation {
inherit updateScript;
inherit alsaSupport;
inherit binaryName;
+ inherit requireSigning allowAddonSideload;
inherit jackSupport;
inherit pipewireSupport;
inherit sndioSupport;
From 491072e797f6d28960f182d45125f1f93b9522ce Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sat, 25 Nov 2023 02:30:25 -0500
Subject: [PATCH 2/2] buildMozillaMach: allow overriding
requireSigning/allowAddonSideload
---
pkgs/applications/networking/browsers/firefox/common.nix | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index a35963bbdd41..3d2132c2d1e4 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -21,6 +21,11 @@
, tests ? []
}:
+let
+ # Rename the variables to prevent infinite recursion
+ requireSigningDefault = requireSigning;
+ allowAddonSideloadDefault = allowAddonSideload;
+in
{ lib
, pkgs
@@ -80,6 +85,10 @@
# optionals
+## addon signing/sideloading
+, requireSigning ? requireSigningDefault
+, allowAddonSideload ? allowAddonSideloadDefault
+
## debugging
, debugBuild ? false