texliveAggregationFunction: fix eval

vcunat edited to fix all cases (not just asymptote),
and a two "licnese" typos :-)
This commit is contained in:
Jason "Don" O'Conal 2013-09-03 07:53:36 +10:00 committed by Vladimír Čunát
parent 1f68487337
commit ab0ca44ffb
2 changed files with 4 additions and 7 deletions

View File

@ -113,7 +113,7 @@ rec {
meta = with stdenv.lib; {
description = "A TeX distribution";
homepage = http://www.tug.org/texlive;
licnese = stdenv.lib.licneses.gpl2;
license = stdenv.lib.licenses.gpl2;
maintainers = with maintainers; [ lovek323 raskin ];
platforms = platforms.unix;
};

View File

@ -418,8 +418,6 @@ let
texinfo lzma;
texLive = texLiveAggregationFun {
paths = [ texLive texLiveExtra ];
inherit makeWrapper poppler;
};
};
@ -9841,8 +9839,6 @@ let
paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor
texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo5
texLiveModerntimeline ];
inherit poppler makeWrapper;
});
/* Look in configurations/misc/raskin.nix for usage example (around revisions
@ -9857,8 +9853,9 @@ let
You need to use texLiveAggregationFun to regenerate, say, ls-R (TeX-related file list)
Just installing a few packages doesn't work.
*/
texLiveAggregationFun =
(builderDefsPackage (import ../tools/typesetting/tex/texlive/aggregate.nix));
texLiveAggregationFun = params:
builderDefsPackage (import ../tools/typesetting/tex/texlive/aggregate.nix)
({inherit poppler makeWrapper;} // params);
texDisser = callPackage ../tools/typesetting/tex/disser {};