From edc8602d4723e172405ae00e778c7b407885d6c8 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sat, 6 Jul 2024 00:22:17 +0100
Subject: [PATCH] docs: use pkgsDoc to build helpers

---
 docs/default.nix           |  4 +++-
 flake-modules/packages.nix | 10 +++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/default.nix b/docs/default.nix
index e451c6ee..0f6546d4 100644
--- a/docs/default.nix
+++ b/docs/default.nix
@@ -1,4 +1,4 @@
-{ helpers, pkgs }:
+{ getHelpers, pkgs }:
 let
   # Extend nixpkg's lib, so that we can handle recursive leaf types such as `either`
   lib = pkgs.lib.extend (
@@ -32,6 +32,8 @@ let
     inherit lib;
   };
 
+  helpers = getHelpers pkgsDoc false;
+
   nixvimPath = toString ./..;
 
   gitHubDeclaration = user: repo: branch: subpath: {
diff --git a/flake-modules/packages.nix b/flake-modules/packages.nix
index bba6505a..51d27a6d 100644
--- a/flake-modules/packages.nix
+++ b/flake-modules/packages.nix
@@ -1,14 +1,10 @@
+{ getHelpers, ... }:
 {
   perSystem =
-    {
-      pkgsUnfree,
-      config,
-      helpers,
-      ...
-    }:
+    { pkgsUnfree, config, ... }:
     {
       packages = import ../docs {
-        inherit helpers;
+        inherit getHelpers;
         # Building the docs evaluates each plugin's default package, some of which are unfree
         pkgs = pkgsUnfree;
       };