* Added pgf/tikz.

* runLaTeX: allow additional TeX packages to be specified.
* teTeX setup hook: TEXMFNIX doesn't seem to work, use TEXINPUTS.

svn path=/nixpkgs/trunk/; revision=8261

pkgs/misc/tex/nix/default.nix

@@ -8,6 +8,7 @@ rec {
     , generatePDF ? true
     , extraFiles ? []
     , compressBlanksInIndex ? true
+    , packages ? []
     }:
     
     pkgs.stdenv.mkDerivation {
@@ -21,7 +22,7 @@ rec {
 
       includes = import (findLaTeXIncludes {inherit rootFile;});
       
-      buildInputs = [ pkgs.tetex pkgs.perl ];
+      buildInputs = [ pkgs.tetex pkgs.perl ] ++ packages;
     };
 
     

pkgs/misc/tex/pgf/default.nix

@@ -0,0 +1,16 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "pgf-1.10";
+  
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/pgf/pgf-1.10.tar.gz;
+    sha256 = "1y605wmjxryphh0y5zgzvdq6xjxb2bjb95j36d4wg1a7n93ksswl";
+  };
+
+  buildPhase = "true";
+  installPhase = "
+    ensureDir $out/share/texmf-nix
+    cp -prd * $out/share/texmf-nix
+  ";
+}

pkgs/misc/tex/tetex/setup-hook.sh

@@ -1,6 +1,6 @@
 addTeXMFPath () {
     if test -d "$1/share/texmf-nix"; then
-        export TEXMFNIX="${TEXMFNIX}${TEXMFNIX:+:}$1/share/texmf-nix"
+        export TEXINPUTS="${TEXINPUTS}${TEXINPUTS:+:}$1/share/texmf-nix//:"
     fi
 }
 

pkgs/top-level/all-packages.nix

@@ -3122,6 +3122,10 @@ rec {
     db4 = db45;
   };
 
+  pgf = import ../misc/tex/pgf {
+    inherit fetchurl stdenv;
+  };
+
   polytable = import ../misc/tex/polytable {
     inherit fetchurl stdenv tetex lazylist;
   };