diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/neovim')
-rw-r--r-- | nixpkgs/pkgs/applications/editors/neovim/default.nix | 7 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/editors/neovim/wrapper.nix | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/editors/neovim/default.nix b/nixpkgs/pkgs/applications/editors/neovim/default.nix index 5d623cdfc6db..56f846f0c5f9 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/default.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { name = "neovim-unwrapped-${version}"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "113lrr9gwimvvzlkwlishm4cjqcf30xq9jfxn7vh41ckgnbiwf3w"; + sha256 = "1j6w5jvq5v7kf7diad91qs1acr427nidnk9s24yyrz0hwdd1c2lh"; }; patches = [ @@ -37,6 +37,7 @@ in ./system_rplugin_manifest.patch ]; + dontFixCmake = true; enableParallelBuilding = true; buildInputs = [ @@ -76,7 +77,7 @@ in disallowedReferences = [ stdenv.cc ]; cmakeFlags = [ - "-DLUA_PRG=${neovimLuaEnv}/bin/lua" + "-DLUA_PRG=${neovimLuaEnv.interpreter}" "-DGPERF_PRG=${gperf}/bin/gperf" ] ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" diff --git a/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index 7d76bc1fd1a0..aa1e2a6b5bd7 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix @@ -12,7 +12,8 @@ neovim: let wrapper = { - withPython ? true, extraPythonPackages ? (_: []) /* the function you would have passed to python.withPackages */ + extraMakeWrapperArgs ? "" + , withPython ? true, extraPythonPackages ? (_: []) /* the function you would have passed to python.withPackages */ , withPython3 ? true, extraPython3Packages ? (_: []) /* the function you would have passed to python.withPackages */ , withNodeJs? false , withRuby ? true @@ -113,7 +114,7 @@ let # https://github.com/neovim/neovim/issues/9413 wrapProgram $out/bin/nvim \ --set NVIM_SYSTEM_RPLUGIN_MANIFEST $out/rplugin.vim \ - --add-flags "-u ${vimUtils.vimrcFile configure}" + --add-flags "-u ${vimUtils.vimrcFile configure}" ${extraMakeWrapperArgs} ''; preferLocalBuild = true; |