eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-06-28 01:18:32 +02:00
Code Issues Releases Wiki Activity

firefox: make package nullable (#4113)

Browse Source
This commit is contained in:
Naïm Favier 2023-07-25 18:49:12 +02:00 committed by GitHub
parent 0306d5ed7e
commit ba2c0737cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/programs/firefox.nix
View File

@ -137,7 +137,7 @@ in {
enable = mkEnableOption "Firefox"; enable = mkEnableOption "Firefox";
package = mkOption { package = mkOption {
type = types.package; type = with types; nullOr package;
default = if versionAtLeast config.home.stateVersion "19.09" then default = if versionAtLeast config.home.stateVersion "19.09" then
pkgs.firefox pkgs.firefox
else else
@ -158,6 +158,7 @@ in {
The Firefox package to use. If state version ≥ 19.09 then The Firefox package to use. If state version ≥ 19.09 then
this should be a wrapped Firefox package. For earlier state this should be a wrapped Firefox package. For earlier state
versions it should be an unwrapped Firefox package. versions it should be an unwrapped Firefox package.
Set to <literal>null</literal> to disable installing Firefox.
''; '';
}; };
@ -526,7 +527,7 @@ in {
cfg.package.override (old: { cfg = old.cfg or { } // fcfg; }) cfg.package.override (old: { cfg = old.cfg or { } // fcfg; })
else else
(pkgs.wrapFirefox.override { config = bcfg; }) cfg.package { }; (pkgs.wrapFirefox.override { config = bcfg; }) cfg.package { };
in [ package ]; in lib.optional (cfg.package != null) package;
home.file = mkMerge ([{ home.file = mkMerge ([{
"${firefoxConfigPath}/profiles.ini" = "${firefoxConfigPath}/profiles.ini" =