public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

texFunctions: Use modular texlive instead of tetex

Browse Source
This commit is contained in:
Eelco Dolstra 2015-12-03 17:36:38 +01:00
parent 33044458eb
commit ec795d3632
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/typesetting/tex/nix/default.nix
View File

@ -10,11 +10,16 @@ rec {
, extraFiles ? [] , extraFiles ? []
, compressBlanksInIndex ? true , compressBlanksInIndex ? true
, packages ? [] , packages ? []
, texPackages ? {}
, copySources ? false , copySources ? false
}: }:
assert generatePDF -> !generatePS; assert generatePDF -> !generatePS;
let
tex = pkgs.texlive.combine texPackages;
in
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "doc"; name = "doc";
@ -27,7 +32,7 @@ rec {
includes = map (x: [x.key (baseNameOf (toString x.key))]) includes = map (x: [x.key (baseNameOf (toString x.key))])
(findLaTeXIncludes {inherit rootFile;}); (findLaTeXIncludes {inherit rootFile;});
buildInputs = [ pkgs.tetex pkgs.perl ] ++ packages; buildInputs = [ tex pkgs.perl ] ++ packages;
}; };
@ -103,7 +108,7 @@ rec {
builder = ./dot2pdf.sh; builder = ./dot2pdf.sh;
inherit dotGraph fontsConf; inherit dotGraph fontsConf;
buildInputs = [ buildInputs = [
pkgs.perl pkgs.tetex pkgs.graphviz pkgs.perl pkgs.graphviz
]; ];
}; };
@ -117,7 +122,7 @@ rec {
builder = ./dot2ps.sh; builder = ./dot2ps.sh;
inherit dotGraph; inherit dotGraph;
buildInputs = [ buildInputs = [
pkgs.perl pkgs.tetex pkgs.graphviz pkgs.ghostscript pkgs.perl pkgs.graphviz pkgs.ghostscript
]; ];
}; };