diff --git a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix index fec166c9af8e..67a52edd4590 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix @@ -84,10 +84,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 76da80311de0..44cbfa33fa2c 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -636,6 +636,4 @@ lib.recursiveUpdate orig rec { fi ''; }; - - texcount.mainProgram = "texcount"; }