Unverified Commit 04277cdd authored by Vincenzo Mantova's avatar Vincenzo Mantova Committed by GitHub
Browse files

texlive.withPackages: respect .outputSpecified even for old style packages (#265645)

parent 023b99e9

pkgs/tools/typesetting/tex/texlive/build-tex-env.nix

+4 −3
Original line number Diff line number Diff line
@@ -40,9 +40,10 @@ lib.fix (self: { 
let

  ### texlive.combine backward compatibility

  # if necessary, convert old style { pkgs = [ ... ]; } packages to attribute sets

  ensurePkgSets = ps: if ! __fromCombineWrapper && builtins.any (p: p ? pkgs && builtins.all (p: p ? tlType) p.pkgs) ps

    then let oldStyle = builtins.partition (p: p ? pkgs && builtins.all (p: p ? tlType) p.pkgs) ps;

      in oldStyle.wrong ++ lib.concatMap toTLPkgSets oldStyle.right

  isOldPkgList = p: ! p.outputSpecified or false && p ? pkgs && builtins.all (p: p ? tlType) p.pkgs;

  ensurePkgSets = ps: if ! __fromCombineWrapper && builtins.any isOldPkgList ps

    then let oldPkgLists = builtins.partition isOldPkgList ps;

      in oldPkgLists.wrong ++ lib.concatMap toTLPkgSets oldPkgLists.right

    else ps;



  pkgList = rec {