diff options
author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-06-25 11:42:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-25 11:42:47 +0200 |
commit | b45a1a2e82d4ebd805d0fca32ae0c086df21357a (patch) | |
tree | f474f8ad7265476add88850a89729132bac2b1c0 /pkgs | |
parent | fa288e60506565c472ec8b2c8df0b52342392cb3 (diff) | |
parent | 9744ff74adb4f6ab864241d9bae4dda2ca5421dc (diff) |
Merge pull request #178390 from aszlig/firefox-fix-signing-required-detection
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 153bd31a5e725..1b8e3c879676e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -97,12 +97,15 @@ let nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []); + requiresSigning = browser ? MOZ_REQUIRE_SIGNING + -> toString browser.MOZ_REQUIRE_SIGNING != ""; + # Check that every extension has a unqiue .name attribute # and an extid attribute extensions = if nameArray != (lib.unique nameArray) then throw "Firefox addon name needs to be unique" - else if ! (lib.hasSuffix "esr" browser.name) then - throw "Nix addons are only supported in Firefox ESR" + else if requiresSigning && !lib.hasSuffix "esr" browser.name then + throw "Nix addons are only supported without signature enforcement (eg. Firefox ESR)" else builtins.map (a: if ! (builtins.hasAttr "extid" a) then throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" |