From 1fe6ab0e083b50b6c24f0fd73bade130ae7dc36d Mon Sep 17 00:00:00 2001
From: Luc Chabassier <luc@dwarfmaster.net>
Date: Fri, 7 Oct 2022 15:54:04 +0200
Subject: [PATCH] make sure the runtimepath is set in NixOS 22.05 (#44)

---
 modules/output.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/output.nix b/modules/output.nix
index 821a32a0..21e45657 100644
--- a/modules/output.nix
+++ b/modules/output.nix
@@ -91,10 +91,17 @@ in
 
       normalizedPlugins = map (x: defaultPlugin // (if x ? plugin then x else { plugin = x; })) config.extraPlugins;
 
-      neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
+      neovimConfig = pkgs.neovimUtils.makeNeovimConfig ({
         inherit customRC;
         plugins = normalizedPlugins;
-      };
+      }
+      # Necessary to make sure the runtime path is set properly in NixOS 22.05,
+      # or more generally before the commit:
+      # cda1f8ae468 - neovim: pass packpath via the wrapper
+      // optionalAttrs (functionArgs pkgs.neovimUtils.makeNeovimConfig ? configure) {
+        configure.packages =
+          { nixvim = { start = map (x: x.plugin) normalizedPlugins; opt = []; }; };
+      });
 
       extraWrapperArgs = optionalString (config.extraPackages != [ ])
         ''--prefix PATH : "${makeBinPath config.extraPackages}"'';