diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2024-06-25 12:04:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-25 12:04:23 -0400 |
| commit | 5ef104ab485523f3cb2665a068b6462dd4122521 (patch) | |
| tree | b2d3433e24627ba6e55872998bb5b110ddf344ef /pkgs | |
| parent | 9ff2e65ef30ed4ecef840ad9f5278db702de0848 (diff) | |
| parent | 7f1a82fdee08ef865781828d9353571b368a2bb0 (diff) | |
Merge pull request #321750 from xworld21/texlive-deps-resolution-by-pname
texlive.withPackages: relax dependency resolution
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/build-tex-env.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index 148e51f55de58..ed0f0fd39377e 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -58,13 +58,12 @@ let # resolve dependencies of the packages that affect the runtime all = let - # order of packages is irrelevant - packages = builtins.sort (a: b: a.pname < b.pname) (ensurePkgSets (requiredTeXPackages tl)); + packages = ensurePkgSets (requiredTeXPackages tl); runtime = builtins.partition (p: p.outputSpecified or false -> builtins.elem (p.tlOutputName or p.outputName) [ "out" "tex" "tlpkg" ]) packages; keySet = p: { - key = ((p.name or "${p.pname}-${p.version}") + "-" + p.tlOutputName or p.outputName or ""); + key = p.pname or p.name + lib.optionalString (p.outputSpecified or false) ("-" + p.tlOutputName or p.outputName or ""); inherit p; tlDeps = if p ? tlDeps then ensurePkgSets p.tlDeps else (p.requiredTeXPackages or (_: [ ]) tl); }; @@ -211,7 +210,7 @@ let __overrideTeXConfig = newArgs: let appliedArgs = if builtins.isFunction newArgs then newArgs args else newArgs; in self (args // { __fromCombineWrapper = false; } // appliedArgs); - withPackages = reqs: self (args // { requiredTeXPackages = ps: requiredTeXPackages ps ++ reqs ps; __fromCombineWrapper = false; }); + withPackages = reqs: self (args // { requiredTeXPackages = ps: reqs ps ++ requiredTeXPackages ps; __fromCombineWrapper = false; }); }; # TeXLive::TLOBJ::fmtutil_cnf_lines |