Merge pull request #269817 from Infinidoge/fix/firefox-wrapper

buildMozillaMach: addon signing and sideloading fixes
This commit is contained in:
Martin Weinelt 2024-02-08 22:19:55 +01:00 committed by GitHub
commit bad0e53e48
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -21,6 +21,11 @@
, tests ? [] , tests ? []
}: }:
let
# Rename the variables to prevent infinite recursion
requireSigningDefault = requireSigning;
allowAddonSideloadDefault = allowAddonSideload;
in
{ lib { lib
, pkgs , pkgs
@ -80,6 +85,10 @@
# optionals # optionals
## addon signing/sideloading
, requireSigning ? requireSigningDefault
, allowAddonSideload ? allowAddonSideloadDefault
## debugging ## debugging
, debugBuild ? false , debugBuild ? false
@ -559,6 +568,7 @@ buildStdenv.mkDerivation {
inherit updateScript; inherit updateScript;
inherit alsaSupport; inherit alsaSupport;
inherit binaryName; inherit binaryName;
inherit requireSigning allowAddonSideload;
inherit jackSupport; inherit jackSupport;
inherit pipewireSupport; inherit pipewireSupport;
inherit sndioSupport; inherit sndioSupport;