diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 85c231626b10..b480f18a3827 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -5,7 +5,8 @@ cmake, gettext, libuv, - lua, + lua5_1, + luajit, pkg-config, unibilium, utf8proc, @@ -25,6 +26,11 @@ fish ? null, python3 ? null, }: + +let + lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1; +in + stdenv.mkDerivation ( finalAttrs: let diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa357ead5f9b..010fb54865e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11612,10 +11612,7 @@ with pkgs; # more usecases when wrapping neovim. The interface is being actively worked on # so expect breakage. use wrapNeovim instead if you want a stable alternative wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; - wrapNeovim = neovim-unwrapped: makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); - neovim-unwrapped = callPackage ../by-name/ne/neovim-unwrapped/package.nix { - lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1; - }; + wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovimUtils = callPackage ../applications/editors/neovim/utils.nix { lua = lua5_1;