nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 01:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #321750 from xworld21/texlive-deps-resolution-by-pname

Browse Source 
texlive.withPackages: relax dependency resolution
This commit is contained in:
Dmitry Kalinkin 2024-06-25 12:04:23 -04:00 committed by GitHub
commit 5ef104ab48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/typesetting/tex/texlive/build-tex-env.nix
View File

@ -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