From 9ddcb902f800a6a8580b8fd59c169aa79550cb34 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 14 Sep 2025 00:40:17 +0200 Subject: [PATCH] texlive: disable luajit on loongarch64-linux --- pkgs/tools/typesetting/tex/texlive/bin.nix | 4 ++-- pkgs/tools/typesetting/tex/texlive/default.nix | 2 ++ pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 2f01868c1c6b..5c8019cd8d9f 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -48,6 +48,7 @@ asymptote, biber-ms, tlpdb, + luajit, }@args: # Useful resource covering build options: @@ -228,8 +229,7 @@ let }; # RISC-V: https://github.com/LuaJIT/LuaJIT/issues/628 - withLuaJIT = - !(stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) && !stdenv.hostPlatform.isRiscV; + withLuaJIT = lib.meta.availableOn stdenv.hostPlatform luajit; in rec { # un-indented diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index a237144a2ca9..4748f2f608d6 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -44,6 +44,7 @@ extraMirrors ? [ ], recurseIntoAttrs, nixfmt, + luajit, }: let # various binaries (compiled) @@ -90,6 +91,7 @@ let python3 ruby zip + luajit ; }; in diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index fb0a180e1bfd..489fc23c05eb 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -23,6 +23,7 @@ python3, ruby, zip, + luajit, }: oldTlpdb: let @@ -545,9 +546,7 @@ lib.recursiveUpdate orig rec { ''; # RISC-V: https://github.com/LuaJIT/LuaJIT/issues/628 - luajittex.binfiles = lib.optionals ( - !(stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) && !stdenv.hostPlatform.isRiscV - ) orig.luajittex.binfiles; + luajittex.binfiles = lib.optionals (lib.meta.availableOn stdenv.hostPlatform luajit) orig.luajittex.binfiles; texdoc = { extraRevision = "-tlpdb${toString tlpdbVersion.revision}";