From ba2c0737cc848db03470828fdb5e86df75ed42a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 25 Jul 2023 18:49:12 +0200 Subject: [PATCH] firefox: make package nullable (#4113) --- modules/programs/firefox.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix index fc80c226c..d420f554f 100644 --- a/modules/programs/firefox.nix +++ b/modules/programs/firefox.nix @@ -137,7 +137,7 @@ in { enable = mkEnableOption "Firefox"; package = mkOption { - type = types.package; + type = with types; nullOr package; default = if versionAtLeast config.home.stateVersion "19.09" then pkgs.firefox else @@ -158,6 +158,7 @@ in { The Firefox package to use. If state version ≥ 19.09 then this should be a wrapped Firefox package. For earlier state versions it should be an unwrapped Firefox package. + Set to null to disable installing Firefox. ''; }; @@ -526,7 +527,7 @@ in { cfg.package.override (old: { cfg = old.cfg or { } // fcfg; }) else (pkgs.wrapFirefox.override { config = bcfg; }) cfg.package { }; - in [ package ]; + in lib.optional (cfg.package != null) package; home.file = mkMerge ([{ "${firefoxConfigPath}/profiles.ini" =