dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #202040 from Mic92/luajit

Browse Source 
luajit: riscv fixes
This commit is contained in:
Jörg Thalheim 2022-12-10 17:23:03 +00:00 committed by GitHub
commit fa3cc9fddd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/luajit/default.nix
View File

@ -127,6 +127,8 @@ stdenv.mkDerivation rec {
homepage = "http://luajit.org";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
# See https://github.com/LuaJIT/LuaJIT/issues/628
badPlatforms = [ "riscv64-linux" "riscv64-linux" ];
maintainers = with maintainers; [ thoughtpolice smironov vcunat lblasc ];
} // extraMeta;
}

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

@ -32806,7 +32806,7 @@ with pkgs;
wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
neovim-unwrapped = callPackage ../applications/editors/neovim {
CoreServices = darwin.apple_sdk.frameworks.CoreServices;
lua = luajit;
lua = if (stdenv.hostPlatform.isRiscV64 || stdenv.hostPlatform.isRiscV64) then lua5_1 else luajit;
};
neovimUtils = callPackage ../applications/editors/neovim/utils.nix {