nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

firefox: fix build failure when package is null

Browse source 
Native messaging hosts module assumed all hosts are packages, and we
were passing null before.

The patch also adds a test case for a null firefox package to avoid
regressions in the future for this common (on Darwin at least) scenario.

Note: Thunderbird doesn't need a similar change because it doesn't allow
a null package.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
This commit is contained in:
Ihar Hrachyshka 2025-02-19 18:26:24 -05:00 • committed by Austin Horstman
parent fad54a641a
commit 1a78a4c7fe
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/programs/firefox/mkFirefoxModule.nix
View file

@ -847,9 +847,9 @@ in {
home.packages = lib.optional (cfg.finalPackage != null) cfg.finalPackage;
mozilla.firefoxNativeMessagingHosts = [
cfg.finalPackage # package configured native messaging hosts (entire browser actually)
] ++ cfg.nativeMessagingHosts; # user configured native messaging hosts
mozilla.firefoxNativeMessagingHosts = cfg.nativeMessagingHosts
# package configured native messaging hosts (entire browser actually)
++ (lib.optional (cfg.finalPackage != null) cfg.finalPackage);
home.file = mkMerge ([{
"${cfg.configPath}/profiles.ini" =