From 2dc9ef1b2b87452924de8b8b6868cf854eac6e72 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sun, 17 May 2026 13:21:32 +0100 Subject: [PATCH] texlivePackages: add mainProgram to all packages with a single binary --- .../typesetting/tex/texlive/build-texlive-package.nix | 9 +++++++-- pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix | 2 -- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix index bda645c350b7..e44d22a25e22 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix @@ -83,10 +83,15 @@ let // lib.optionalAttrs hasCatalogue { homepage = "https://ctan.org/pkg/${catalogue}"; } - // lib.optionalAttrs (args ? mainProgram) { - inherit (args) mainProgram; + // lib.optionalAttrs (mainProgram != null) { + inherit mainProgram; }; + # if binfiles contains exactly one entry, use it as mainProgram, but allow overrides via args.mainProgram + mainProgram = + args.mainProgram + or (if builtins.length (args.binfiles or [ ]) == 1 then builtins.head args.binfiles else null); + hasBinfiles = args ? binfiles && args.binfiles != [ ]; hasDocfiles = sha512 ? doc; hasSource = sha512 ? source; diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index 80b7128ca334..f2321c21cbc5 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -627,6 +627,4 @@ lib.recursiveUpdate orig rec { fi ''; }; - - texcount.mainProgram = "texcount"; }