From 55cf1f16324e694c991e846ad5fc897f0f75ac64 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 1 Apr 2025 08:25:30 -0500 Subject: [PATCH] firefox: fix missing lib (#6744) --- modules/programs/firefox/mkFirefoxModule.nix | 42 ++++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/modules/programs/firefox/mkFirefoxModule.nix b/modules/programs/firefox/mkFirefoxModule.nix index 6440d8169..1d913704d 100644 --- a/modules/programs/firefox/mkFirefoxModule.nix +++ b/modules/programs/firefox/mkFirefoxModule.nix @@ -385,33 +385,31 @@ in { }; bookmarks = mkOption { - type = (with types; - coercedTo bookmarkTypes.settingsType (bookmarks: - if bookmarks != { } then - warn '' - ${cfg.name} bookmarks have been refactored into a submodule that now explicitly require a 'force' option to be enabled. + type = (types.coercedTo bookmarkTypes.settingsType (bookmarks: + if bookmarks != { } then + lib.warn '' + ${cfg.name} bookmarks have been refactored into a submodule that now explicitly require a 'force' option to be enabled. - Replace: + Replace: - ${moduleName}.profiles.${name}.bookmarks = [ ... ]; + ${moduleName}.profiles.${name}.bookmarks = [ ... ]; - With: + With: - ${moduleName}.profiles.${name}.bookmarks = { - force = true; - settings = [ ... ]; - }; - '' { + ${moduleName}.profiles.${name}.bookmarks = { force = true; - settings = bookmarks; - } - else - { }) (submodule ({ config, ... }: - import ./profiles/bookmarks.nix { - inherit config lib pkgs; - modulePath = modulePath - ++ [ "profiles" name "bookmarks" ]; - }))); + settings = [ ... ]; + }; + '' { + force = true; + settings = bookmarks; + } + else + { }) (types.submodule ({ config, ... }: + import ./profiles/bookmarks.nix { + inherit config lib pkgs; + modulePath = modulePath ++ [ "profiles" name "bookmarks" ]; + }))); default = { }; internal = !enableBookmarks; description = "Declarative bookmarks.";