firefox: deprecate vendorPath (#6519)

This is a reaction to PR #6460
This commit is contained in:
Kilian Mio 2025-02-26 15:20:52 +01:00 committed by GitHub
parent 18e74c2e02
commit 87743e9383
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 25 deletions

View file

@ -18,12 +18,8 @@ in {
unwrappedPackageName = "firefox-unwrapped";
visible = true;
platforms.linux = rec {
vendorPath = ".mozilla";
configPath = "${vendorPath}/firefox";
};
platforms.linux = rec { configPath = ".mozilla/firefox"; };
platforms.darwin = {
vendorPath = "Library/Application Support/Mozilla";
configPath = "Library/Application Support/Firefox";
};
})

View file

@ -280,11 +280,7 @@ in {
vendorPath = mkOption {
internal = true;
type = with types; nullOr str;
default = with platforms;
if isDarwin then
darwin.vendorPath or null
else
linux.vendorPath or null;
default = null;
example = ".mozilla";
description =
"Directory containing the native messaging hosts directory.";
@ -299,7 +295,7 @@ in {
description = "Directory containing the ${appName} configuration files.";
};
nativeMessagingHosts = optionalAttrs (cfg.vendorPath != null) (mkOption {
nativeMessagingHosts = mkOption {
inherit visible;
type = types.listOf types.package;
default = [ ];
@ -307,7 +303,7 @@ in {
Additional packages containing native messaging hosts that should be
made available to ${appName} extensions.
'';
});
};
finalPackage = mkOption {
inherit visible;
@ -852,6 +848,9 @@ in {
will be removed in the future. Please change to overriding the package
configuration using '${moduleName}.package' instead. You can refer to
its example for how to do this.
'' ++ optional (cfg.vendorPath != null) ''
Using '${moduleName}.vendorPath' has been deprecated and
will be removed in the future. Native messaging hosts will function normally without specifying this path.
'';
home.packages = lib.optional (cfg.finalPackage != null) cfg.finalPackage;

View file

@ -19,14 +19,8 @@ in {
unwrappedPackageName = "floorp-unwrapped";
visible = true;
platforms.linux = {
configPath = ".floorp";
vendorPath = ".mozilla";
};
platforms.darwin = {
configPath = "Library/Application Support/Floorp";
vendorPath = "Library/Application Support/Mozilla";
};
platforms.linux = { configPath = ".floorp"; };
platforms.darwin = { configPath = "Library/Application Support/Floorp"; };
})
];
}

View file

@ -29,13 +29,9 @@ in {
wrappedPackageName = "librewolf";
unwrappedPackageName = "librewolf-unwrapped";
platforms.linux = {
configPath = ".librewolf";
vendorPath = ".mozilla";
};
platforms.linux = { configPath = ".librewolf"; };
platforms.darwin = {
configPath = "Library/Application Support/LibreWolf";
vendorPath = "Library/Application Support/Mozilla";
};
enableBookmarks = false;