From 51e3fe53462eb72aa038f2b47735acea8b1fcae2 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 10 Jul 2021 20:28:51 +0200 Subject: [PATCH] neovim: set meta in the unwrapped version instead of the wrapper: the wrapper will inherit the value from the unwrapped version. This allows nix run nixpkgs#neovim-unwrapped to work too. --- pkgs/applications/editors/neovim/default.nix | 1 + pkgs/applications/editors/neovim/wrapper.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index bfa7e8e2009..f36009afc69 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -131,6 +131,7 @@ in - Improve extensibility with a new plugin architecture ''; homepage = "https://www.neovim.io"; + mainProgram = "nvim"; # "Contributions committed before b17d96 by authors who did not sign the # Contributor License Agreement (CLA) remain under the Vim license. # Contributions committed after b17d96 are licensed under Apache 2.0 unless diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 96b61a43cca..d94f3239f4b 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -131,7 +131,6 @@ let hydraPlatforms = []; # prefer wrapper over the package priority = (neovim.meta.priority or 0) - 1; - mainProgram = "nvim"; }; }; in