From 87b1ba03db5f27d9b51d489d2ea62e25845ef350 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Mon, 28 Aug 2023 18:27:21 +0100 Subject: [PATCH] texlive.luajittex: disable binaries on unsupported platforms --- pkgs/tools/typesetting/tex/texlive/default.nix | 2 +- pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index a2984fdd49b5..60e7043e332d 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -37,7 +37,7 @@ let overriddenTlpdb = let overrides = import ./tlpdb-overrides.nix { inherit - lib bin tlpdb tlpdbxz tl + stdenv lib bin tlpdb tlpdbxz tl installShellFiles coreutils findutils gawk getopt ghostscript_headless gnugrep gnumake gnupg gnused gzip ncurses perl python3 ruby zip; diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index 7930e6f903e2..cbf5bb89ffa3 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -1,4 +1,4 @@ -{ lib, tlpdb, bin, tlpdbxz, tl +{ stdenv, lib, tlpdb, bin, tlpdbxz, tl , installShellFiles , coreutils, findutils, gawk, getopt, ghostscript_headless, gnugrep , gnumake, gnupg, gnused, gzip, ncurses, perl, python3, ruby, zip @@ -329,6 +329,11 @@ in lib.recursiveUpdate orig rec { #### misc + # 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; + # tlpdb lists license as "unknown", but the README says lppl13: http://mirrors.ctan.org/language/arabic/arabi-add/README arabi-add.license = [ "lppl13c" ];