Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lua: use meta.availableOn to pick luajit/lua5_1 #209141

Merged
merged 2 commits into from Jan 6, 2023
Merged

lua: use meta.availableOn to pick luajit/lua5_1 #209141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffccd54
luajit: add powerpc64le-linux to badPlatforms
Jan 5, 2023
c20aeab
lua: use meta.availableOn to pick luajit/lua5_1
Jan 5, 2023
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
6 changes: 4 additions & 2 deletions pkgs/development/interpreters/luajit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,10 @@ stdenv.mkDerivation rec {
homepage = "https://luajit.org/";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
# See https://github.com/LuaJIT/LuaJIT/issues/628
badPlatforms = [ "riscv64-linux" "riscv64-linux" ];
badPlatforms = [
"riscv64-linux" "riscv64-linux" # See https://github.com/LuaJIT/LuaJIT/issues/628
"powerpc64le-linux" # `#error "No support for PPC64"`
];
maintainers = with maintainers; [ thoughtpolice smironov vcunat lblasc ];
} // extraMeta;
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33054,7 +33054,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 = if (stdenv.hostPlatform.isRiscV64 || stdenv.hostPlatform.isRiscV64) then lua5_1 else luajit;
lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1;
};

neovimUtils = callPackage ../applications/editors/neovim/utils.nix {
Expand Down