mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 23:36:17 +01:00
neovim: build with luajit on aarch64-linux
https://github.com/NixOS/nixpkgs/pull/129543 disabled building neovim with luajit on all `aarch64` platforms, however, building neovim with luajit on `aarch64-linux` builds successfully, and avoids various issues I encountered with some Lua-based plugins.
This commit is contained in:
parent
a613f88023
commit
a537bad8a1
1 changed files with 2 additions and 2 deletions
|
@ -27907,7 +27907,7 @@ in
|
||||||
wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
|
wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
|
||||||
wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
|
wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
|
||||||
neovim-unwrapped = callPackage ../applications/editors/neovim {
|
neovim-unwrapped = callPackage ../applications/editors/neovim {
|
||||||
# neovim doesn't build with luajit on aarch64:
|
# neovim doesn't build with luajit on aarch64-darwin :
|
||||||
# ./luarocks init
|
# ./luarocks init
|
||||||
# PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found:
|
# PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found:
|
||||||
# no field package.preload['luarocks.core.hardcoded']
|
# no field package.preload['luarocks.core.hardcoded']
|
||||||
|
@ -27931,7 +27931,7 @@ in
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/129099
|
# See https://github.com/NixOS/nixpkgs/issues/129099
|
||||||
# Possibly related: https://github.com/neovim/neovim/issues/7879
|
# Possibly related: https://github.com/neovim/neovim/issues/7879
|
||||||
lua =
|
lua =
|
||||||
if stdenv.isAarch64 then lua5_1 else
|
if (stdenv.isDarwin && stdenv.isAarch64) then lua5_1 else
|
||||||
luajit;
|
luajit;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue