diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-27 12:24:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-27 12:24:05 +0000 |
commit | 2137c13b409525616ce92598e3440c088096044a (patch) | |
tree | 530aaab70d1dc1687518cadfb8e91b8e611fc776 /pkgs/applications/editors | |
parent | 6d452e839b7012170dc80900987436eac69f7394 (diff) | |
parent | 693c7cd0f7e6ce6ff7c6210ac1857712dac4cad5 (diff) | |
download | nixlib-2137c13b409525616ce92598e3440c088096044a.tar nixlib-2137c13b409525616ce92598e3440c088096044a.tar.gz nixlib-2137c13b409525616ce92598e3440c088096044a.tar.bz2 nixlib-2137c13b409525616ce92598e3440c088096044a.tar.lz nixlib-2137c13b409525616ce92598e3440c088096044a.tar.xz nixlib-2137c13b409525616ce92598e3440c088096044a.tar.zst nixlib-2137c13b409525616ce92598e3440c088096044a.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/vim/macvim-configurable.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 087a375c50cc..6ea6b6c60940 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: +{ lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: let macvim = callPackage ./macvim.nix { inherit stdenv; }; @@ -12,7 +12,6 @@ let # sourcing of the user's vimrc. Use `customRC = "source $HOME/.vim/vimrc"` # if you want to preserve that behavior. configure = let - inherit (stdenv) lib; doConfig = config: let vimrcConfig = config // { # always source the bundled system vimrc |