diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 8701f8d7795b..6bb01b63e5cd 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -11,6 +11,8 @@ applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; + requireSigning = false; + allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree version = "115.8.0"; @@ -26,9 +28,7 @@ extraConfigureFlags = [ "--with-app-name=${pname}" "--with-app-basename=${applicationName}" - "--with-distribution-id=one.ablaze.floorp" "--with-unsigned-addon-scopes=app,system" - "--allow-addon-sideload" ]; meta = { @@ -54,6 +54,5 @@ mlsAPISupport = true; }).overrideAttrs (prev: { MOZ_DATA_REPORTING = ""; - MOZ_REQUIRE_SIGNING = ""; MOZ_TELEMETRY_REPORTING = ""; }) diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index 0e6ba888015e..6a1d59858d80 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -11,6 +11,7 @@ in src = librewolf-src.firefox; requireSigning = false; allowAddonSideload = true; + branding = "browser/branding/librewolf"; inherit (librewolf-src) extraConfigureFlags extraPatches extraPostPatch extraPassthru; meta = { diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index f6689f6ae87d..bb35d92a3d62 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -11,10 +11,7 @@ rec { extraConfigureFlags = [ "--with-app-name=librewolf" "--with-app-basename=LibreWolf" - "--with-branding=browser/branding/librewolf" - "--with-distribution-id=io.gitlab.librewolf-community" "--with-unsigned-addon-scopes=app,system" - "--allow-addon-sideload" ]; extraPostPatch = '' diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index 3e9ebbceed75..6ca7c348969f 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -44,6 +44,7 @@ in ((buildMozillaMach { applicationName = "Betterbird"; binaryName = "betterbird"; + branding = "comm/mail/branding/betterbird"; inherit (thunderbird-unwrapped) application extraPatches; src = fetchurl { @@ -92,11 +93,6 @@ in ((buildMozillaMach { libdbusmenu-gtk3 ]; - extraConfigureFlags = [ - "--enable-application=comm/mail" - "--with-branding=comm/mail/branding/betterbird" - ]; - meta = with lib; { description = "Betterbird is a fine-tuned version of Mozilla Thunderbird, Thunderbird on steroids, if you will"; homepage = "https://www.betterbird.eu/";