From 068f5e97fcb6041e50aa46b44bebd434c9abfd8e Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sat, 14 Sep 2024 11:21:39 -0500 Subject: [PATCH] plugins/tagbar: use tagsPackage --- plugins/by-name/tagbar/default.nix | 11 ++++++++++- tests/test-sources/plugins/by-name/tagbar/default.nix | 7 +++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/plugins/by-name/tagbar/default.nix b/plugins/by-name/tagbar/default.nix index 255631ff..4d1a2f81 100644 --- a/plugins/by-name/tagbar/default.nix +++ b/plugins/by-name/tagbar/default.nix @@ -7,7 +7,6 @@ helpers.vim-plugin.mkVimPlugin { name = "tagbar"; globalPrefix = "tagbar_"; - extraPackages = [ pkgs.ctags ]; maintainers = [ lib.maintainers.GaetanLepage ]; @@ -30,4 +29,14 @@ helpers.vim-plugin.mkVimPlugin { private = "󰛑 "; }; }; + + extraOptions = { + tagsPackage = lib.mkPackageOption pkgs "ctags" { + nullable = true; + }; + }; + + extraConfig = cfg: { + extraPackages = [ cfg.tagsPackage ]; + }; } diff --git a/tests/test-sources/plugins/by-name/tagbar/default.nix b/tests/test-sources/plugins/by-name/tagbar/default.nix index 7532c026..945b4230 100644 --- a/tests/test-sources/plugins/by-name/tagbar/default.nix +++ b/tests/test-sources/plugins/by-name/tagbar/default.nix @@ -51,4 +51,11 @@ }; }; }; + + no-packages = { + plugins.tagbar = { + enable = true; + tagsPackage = null; + }; + }; }