diff options
| author | Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> | 2023-11-08 21:20:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-08 16:20:03 -0500 |
| commit | 04277cddb78dc44f33b6056b868312ad9ee01da1 (patch) | |
| tree | 1df4966cbf90b8507469cfce5675eb419bbc02bf | |
| parent | 023b99e916150bf68483d97be72ec03bdc8a9ac7 (diff) | |
| download | nixpkgs-04277cddb78dc44f33b6056b868312ad9ee01da1.tar nixpkgs-04277cddb78dc44f33b6056b868312ad9ee01da1.tar.gz nixpkgs-04277cddb78dc44f33b6056b868312ad9ee01da1.tar.bz2 nixpkgs-04277cddb78dc44f33b6056b868312ad9ee01da1.tar.lz nixpkgs-04277cddb78dc44f33b6056b868312ad9ee01da1.tar.xz nixpkgs-04277cddb78dc44f33b6056b868312ad9ee01da1.tar.zst nixpkgs-04277cddb78dc44f33b6056b868312ad9ee01da1.zip | |
texlive.withPackages: respect .outputSpecified even for old style packages (#265645)
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/build-tex-env.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index 99eb67aa6ff..41231ae1b18 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -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 { |