Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion pkgs/by-name/ne/neovim-unwrapped/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
cmake,
gettext,
libuv,
lua,
lua5_1,
luajit,
pkg-config,
unibilium,
utf8proc,
Expand All @@ -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
Expand Down
5 changes: 1 addition & 4 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading