thunderbird: deprecate darwinSetupWarning option (#6531)
nixpkgs support thunderbird for darwin now
This commit is contained in:
parent
c0962eeeab
commit
929f8ee836
2 changed files with 10 additions and 13 deletions
|
|
@ -452,11 +452,11 @@ in
|
|||
type = types.bool;
|
||||
default = true;
|
||||
example = false;
|
||||
visible = isDarwin;
|
||||
visible = false;
|
||||
readOnly = !isDarwin;
|
||||
description = ''
|
||||
Warn to set environment variables before using this module. Only
|
||||
relevant on Darwin.
|
||||
Using programs.thunderbird.darwinSetupWarning is deprecated. The
|
||||
module is compatible with all Thunderbird installations.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
@ -611,6 +611,13 @@ in
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
warnings = lib.optionals (!cfg.darwinSetupWarning) [
|
||||
''
|
||||
Using programs.thunderbird.darwinSetupWarning is deprecated and will be
|
||||
removed in the future. Thunderbird is now supported on Darwin.
|
||||
''
|
||||
];
|
||||
|
||||
assertions = [
|
||||
(
|
||||
let
|
||||
|
|
@ -642,13 +649,6 @@ in
|
|||
)
|
||||
];
|
||||
|
||||
warnings = lib.optional (isDarwin && cfg.darwinSetupWarning) ''
|
||||
Thunderbird packages are not yet supported on Darwin. You can still use
|
||||
this module to manage your accounts and profiles by setting
|
||||
'programs.thunderbird.package' to a dummy value, for example using
|
||||
'pkgs.runCommand'.
|
||||
'';
|
||||
|
||||
home.packages = [
|
||||
cfg.package
|
||||
] ++ lib.optional (lib.any (p: p.withExternalGnupg) (attrValues cfg.profiles)) pkgs.gpgme;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue