public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

neovim: use lua on aarch64 (#61588)

Browse Source 
neovim: use lua on aarch64
This commit is contained in:
Gabriel Ebner 2019-05-16 12:59:49 +02:00 committed by GitHub
commit 3eb9c9f84a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/neovim/default.nix
View File

@ -80,6 +80,7 @@ in
"-DGPERF_PRG=${gperf}/bin/gperf" "-DGPERF_PRG=${gperf}/bin/gperf"
] ]
++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
; ;
# triggers on buffer overflow bug while running tests # triggers on buffer overflow bug while running tests
@ -122,8 +123,5 @@ in
license = with licenses; [ asl20 vim ]; license = with licenses; [ asl20 vim ];
maintainers = with maintainers; [ manveru garbas rvolosatovs ]; maintainers = with maintainers; [ manveru garbas rvolosatovs ];
platforms = platforms.unix; platforms = platforms.unix;
# `lua: bad light userdata pointer`
# https://nix-cache.s3.amazonaws.com/log/9ahcb52905d9d417zsskjpc331iailpq-neovim-unwrapped-0.2.2.drv
broken = stdenv.isAarch64;
}; };
} }

5
pkgs/top-level/all-packages.nix
View File

@ -20458,7 +20458,10 @@ in
wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { };
neovim-unwrapped = callPackage ../applications/editors/neovim { neovim-unwrapped = callPackage ../applications/editors/neovim {
lua = luajit; lua =
# neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879
if stdenv.isAarch64 then lua5_1 else
luajit;
}; };
neovim = wrapNeovim neovim-unwrapped { }; neovim = wrapNeovim neovim-unwrapped { };