From 2a694d7ba22dc08b6ab27821d3d0d1543735fbb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 19 Nov 2022 10:06:28 +0100 Subject: [PATCH 1/2] luajit: mark as broken on riscv64 --- pkgs/development/interpreters/luajit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 2d47b0395c36..1f830ac65d0d 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -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; } From 1272bae282eb91e182452903e2493609ae30b370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 20 Nov 2022 13:51:15 +0100 Subject: [PATCH 2/2] neovim-unwrapped: don't use luajit on riscv --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 783bbd1ff696..3b96da153040 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32692,7 +32692,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 {