summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorMatthieu Coudron <mcoudron@hotmail.com>2021-07-10 20:28:51 +0200
committerMatthieu Coudron <teto@users.noreply.github.com>2021-07-10 20:49:40 +0200
commit51e3fe53462eb72aa038f2b47735acea8b1fcae2 (patch)
treec64ff4e8b1f990fea3899e351695a01e67ca3259 /pkgs/applications/editors
parentfb45fa64ae3460d6bd2701ab5a6c4512d781f166 (diff)
downloadnixpkgs-51e3fe53462eb72aa038f2b47735acea8b1fcae2.tar
nixpkgs-51e3fe53462eb72aa038f2b47735acea8b1fcae2.tar.gz
nixpkgs-51e3fe53462eb72aa038f2b47735acea8b1fcae2.tar.bz2
nixpkgs-51e3fe53462eb72aa038f2b47735acea8b1fcae2.tar.lz
nixpkgs-51e3fe53462eb72aa038f2b47735acea8b1fcae2.tar.xz
nixpkgs-51e3fe53462eb72aa038f2b47735acea8b1fcae2.tar.zst
nixpkgs-51e3fe53462eb72aa038f2b47735acea8b1fcae2.zip
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.
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/neovim/default.nix1
-rw-r--r--pkgs/applications/editors/neovim/wrapper.nix1
2 files changed, 1 insertions, 1 deletions
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