From a537bad8a15f5d81e0d86bb4c5c3310295dd7cfc Mon Sep 17 00:00:00 2001 From: Benjamin Tan Date: Sat, 7 Aug 2021 23:50:22 +0800 Subject: [PATCH] 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. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eb3e231342e..2e657df3b042 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27907,7 +27907,7 @@ in wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); 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 # PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found: # no field package.preload['luarocks.core.hardcoded'] @@ -27931,7 +27931,7 @@ in # See https://github.com/NixOS/nixpkgs/issues/129099 # Possibly related: https://github.com/neovim/neovim/issues/7879 lua = - if stdenv.isAarch64 then lua5_1 else + if (stdenv.isDarwin && stdenv.isAarch64) then lua5_1 else luajit; };