From ffccd54afbd9a15670aca141b97f21806de4cae0 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 5 Jan 2023 00:50:27 -0800 Subject: [PATCH 1/2] luajit: add powerpc64le-linux to badPlatforms --- pkgs/development/interpreters/luajit/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index d1211ce0a9283..de5153d1cd8a0 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -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; } From c20aeabddb112a7ebe50dcfe886afde0751dce9b Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 5 Jan 2023 00:51:00 -0800 Subject: [PATCH 2/2] lua: use meta.availableOn to pick luajit/lua5_1 --- 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 9df56d2890b7b..2553e8fc732e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {