From 0f4c798c81139fa0dd0b3e6b0e561c193e9b0dea Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Mon, 4 Feb 2019 14:57:26 +0900
Subject: [PATCH] neovim: allow to override package

If you want to run a development version for instance, it is easier to
set neovim.package rather than work around the wrapping mechanism etc.

(cherry picked from commit c18984c452013ff0edb3d67ab0a1a245333dd4ce)
---
 modules/programs/neovim.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/programs/neovim.nix b/modules/programs/neovim.nix
index 76dcd42d..09aada4c 100644
--- a/modules/programs/neovim.nix
+++ b/modules/programs/neovim.nix
@@ -95,6 +95,13 @@ in
         '';
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.neovim-unwrapped;
+        defaultText = "pkgs.neovim-unwrapped";
+        description = "The package to use for the neovim binary.";
+      };
+
       configure = mkOption {
         type = types.attrs;
         default = {};
@@ -121,7 +128,7 @@ in
 
   config = mkIf cfg.enable {
     home.packages = [
-      (pkgs.neovim.override {
+      (pkgs.wrapNeovim cfg.package {
         inherit (cfg)
           extraPython3Packages withPython3
           extraPythonPackages withPython