Skip to content

Commit 4260242

Browse files
xworld21zeme-wana
authored andcommitted
texlive.withPackages: do not override output attributes
The output attributes should never be modified to avoid interfering with standard interfaces such as overrideAttrs. (cherry picked from commit 9950ef4)
1 parent 116c1e6 commit 4260242

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

pkgs/tools/typesetting/tex/texlive/build-tex-env.nix

+3-4
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ let
172172

173173
# emulate split output derivation
174174
splitOutputs = {
175-
out = out // { outputSpecified = true; };
176175
texmfdist = texmfdist // { outputSpecified = true; };
177176
texmfroot = texmfroot // { outputSpecified = true; };
178177
} // (lib.genAttrs pkgList.nonEnvOutputs (outName: (buildEnv {
@@ -186,9 +185,9 @@ let
186185
inherit meta passthru;
187186
}).overrideAttrs { outputs = [ outName ]; } // { outputSpecified = true; }));
188187

189-
passthru = lib.optionalAttrs (! __combine) (splitOutputs // {
190-
all = builtins.attrValues splitOutputs;
191-
}) // {
188+
passthru = {
189+
# these are not part of pkgList.nonEnvOutputs and must be exported in passthru
190+
inherit (splitOutputs) texmfdist texmfroot;
192191
# This is set primarily to help find-tarballs.nix to do its job
193192
requiredTeXPackages = builtins.filter lib.isDerivation (pkgList.bin ++ pkgList.nonbin
194193
++ lib.optionals (! __fromCombineWrapper)

0 commit comments

Comments
 (0)