From ab0ca44ffbf808ab602ccb3eb0cd3e2eb3a99256 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Tue, 3 Sep 2013 07:53:36 +1000 Subject: [PATCH] texliveAggregationFunction: fix eval vcunat edited to fix all cases (not just asymptote), and a two "licnese" typos :-) --- pkgs/tools/typesetting/tex/texlive/default.nix | 2 +- pkgs/top-level/all-packages.nix | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index e53c336c0ed..540ab07c286 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -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; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b4c871979a..4f201725322 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {};