diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-12-16 21:43:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-16 21:43:46 +0000 |
| commit | 8dc107be5be57f9164174bfecf152a7f01fd4fbe (patch) | |
| tree | 04e88c2d6334dd8cb3f731bd5829e214635f97d2 /pkgs | |
| parent | ee03ae2c414eb60e221491f133fc135a1245bd30 (diff) | |
| parent | 15c4b78c3659aa66060dd42370c3db2be87d97b2 (diff) | |
| download | nixlib-8dc107be5be57f9164174bfecf152a7f01fd4fbe.tar nixlib-8dc107be5be57f9164174bfecf152a7f01fd4fbe.tar.gz nixlib-8dc107be5be57f9164174bfecf152a7f01fd4fbe.tar.bz2 nixlib-8dc107be5be57f9164174bfecf152a7f01fd4fbe.tar.lz nixlib-8dc107be5be57f9164174bfecf152a7f01fd4fbe.tar.xz nixlib-8dc107be5be57f9164174bfecf152a7f01fd4fbe.tar.zst nixlib-8dc107be5be57f9164174bfecf152a7f01fd4fbe.zip | |
Merge pull request #32738 from LambdaP/neovim-viAlias-option
neovim: add viAlias argument
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/neovim/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index ba3abe6a221f..238109ae9cb4 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -9,6 +9,7 @@ , withPyGUI ? false , vimAlias ? false +, viAlias ? false , configure ? null }: @@ -174,7 +175,9 @@ let }; }; -in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation { +in if (vimAlias == false && viAlias == false && configure == null) + then neovim + else stdenv.mkDerivation { name = "neovim-${neovim.version}-configured"; inherit (neovim) version meta; @@ -187,6 +190,8 @@ in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivat done '' + optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim + '' + optionalString viAlias '' + ln -s $out/bin/nvim $out/bin/vi '' + optionalString (configure != null) '' wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}" ''; |