texlive/combine.nix: clarify implementation of mkUniqueOutPaths

mkUniqueOutPaths used to produce empty paths for dummy packages, this
version strips those out. This does not affect `pkgList.bin` at all, but
`pkgList.nonbin` is affected, so this is not exactly a refactoring. It
should not harm to have a cleaner `paths`.

Also, original comment said "here we deal with those dummy packages
needed for hyphenation filtering". This doesn't seem to be true, the
packages that were really filtered are actually metapackages that
represent collections. I also could not find any dummy packages even in
the originally committed version.
This commit is contained in:
Dmitry Kalinkin 2019-03-03 21:14:04 -05:00
parent 658d83a182
commit 30364211e6
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333

View File

@ -37,9 +37,10 @@ let
else optional (head l != elemAt l 1) (head l) ++ un_adj (tail l);
in un_adj (lib.sort comparator list);
mkUniqueOutPaths = pkgs: fastUnique (a: b: a < b) # highlighting hack: >
# here we deal with those dummy packages needed for hyphenation filtering
(map (p: if lib.isDerivation p then p.outPath else "") pkgs);
uniqueStrings = fastUnique (a: b: a < b);
mkUniqueOutPaths = pkgs: uniqueStrings
(map (p: p.outPath) (builtins.filter lib.isDerivation pkgs));
in buildEnv {
name = "texlive-${extraName}-${bin.texliveYear}";