diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-03-03 21:14:04 -0500 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-03-03 21:14:04 -0500 |
commit | 30364211e699ec91a70f1135dd6ad0a9b89a7940 (patch) | |
tree | db54b100f86d126674c36da4c587c8694cb30274 /pkgs/tools/typesetting | |
parent | 658d83a182553b7221004c08ae970b6c46d6e9e4 (diff) |
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.
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/combine.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 4aa3c3074a0b..834828248e2e 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -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}"; |