Update TeXLive packages w.r.t. TeXLive2009 texmf vs. prefix layout

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

5 files changed, 38 insertions, 23 deletions

diff --git a/pkgs/misc/tex/texlive/beamer.nix b/pkgs/misc/tex/texlive/beamer.nix
index 5f4ffd5421188..5ff2c89316a10 100644
--- a/pkgs/misc/tex/texlive/beamer.nix
+++ b/pkgs/misc/tex/texlive/beamer.nix
@@ -10,8 +10,12 @@ rec {
   propagatedBuildInputs = [texLiveLatexXColor texLivePGF];
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    ensureDir $out/share/texmf-dist/tex/latex/beamer
-    cp -r * $out/share/texmf-dist/tex/latex/beamer 
+    ensureDir $out/share/
+
+    ensureDir $out/texmf-dist/tex/latex/beamer
+    cp -r * $out/texmf-dist/tex/latex/beamer 
+
+    ln -s $out/texmf* $out/share/
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
 
   meta = {
diff --git a/pkgs/misc/tex/texlive/cm-super.nix b/pkgs/misc/tex/texlive/cm-super.nix
index 6c656d8523277..4f15afdc38141 100644
--- a/pkgs/misc/tex/texlive/cm-super.nix
+++ b/pkgs/misc/tex/texlive/cm-super.nix
@@ -8,18 +8,20 @@ rec {
 
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    ensureDir $out/share/texmf/fonts/enc
-    ensureDir $out/share/texmf/fonts/map
-    ensureDir $out/share/texmf/fonts/type1/public/cm-super
-    cp pfb/*.pfb $out/share/texmf/fonts/type1/public/cm-super
-    ensureDir $out/share/texmf/dvips/cm-super
-    cp dvips/*.{map,enc}  $out/share/texmf/dvips/cm-super
-    cp dvips/*.enc  $out/share/texmf/fonts/enc
-    cp dvips/*.map  $out/share/texmf/fonts/map
-    ensureDir $out/share/texmf/dvipdfm/config
-    cp dvipdfm/*.map  $out/share/texmf/dvipdfm/config
+    ensureDir $out/share/
 
-    ln -s $out/share/texmf* $out/
+    ensureDir $out/texmf/fonts/enc
+    ensureDir $out/texmf/fonts/map
+    ensureDir $out/texmf/fonts/type1/public/cm-super
+    cp pfb/*.pfb $out/texmf/fonts/type1/public/cm-super
+    ensureDir $out/texmf/dvips/cm-super
+    cp dvips/*.{map,enc}  $out/texmf/dvips/cm-super
+    cp dvips/*.enc  $out/texmf/fonts/enc
+    cp dvips/*.map  $out/texmf/fonts/map
+    ensureDir $out/texmf/dvipdfm/config
+    cp dvipdfm/*.map  $out/texmf/dvipdfm/config
+
+    ln -s $out/texmf* $out/share/
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
   buildInputs = [texLive];
 
diff --git a/pkgs/misc/tex/texlive/context.nix b/pkgs/misc/tex/texlive/context.nix
index 900726af22980..b502b0f2108aa 100644
--- a/pkgs/misc/tex/texlive/context.nix
+++ b/pkgs/misc/tex/texlive/context.nix
@@ -9,8 +9,12 @@ rec {
   buildInputs = [texLive];
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    ensureDir $out/share/texmf
-    cp -r * $out/share/texmf
+    ensureDir $out/share/
+
+    ensureDir $out/texmf
+    cp -r * $out/texmf
+
+    ln -s $out/texmf* $out/share/
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
 
   meta = {
diff --git a/pkgs/misc/tex/texlive/pgf.nix b/pkgs/misc/tex/texlive/pgf.nix
index e23aa7f24dfe3..fac520290f003 100644
--- a/pkgs/misc/tex/texlive/pgf.nix
+++ b/pkgs/misc/tex/texlive/pgf.nix
@@ -12,8 +12,10 @@ rec {
 
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    ensureDir $out/share/texmf/tex/generic/pgf
-    cp -r * $out/share/texmf/tex/generic/pgf
+    ensureDir $out/share/
+    ensureDir $out/texmf/tex/generic/pgf
+    cp -r * $out/texmf/tex/generic/pgf
+    ln -s $out/texmf* $out/share/
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
 
   meta = {
diff --git a/pkgs/misc/tex/texlive/xcolor.nix b/pkgs/misc/tex/texlive/xcolor.nix
index 0940f4506ee0c..4e8d5eeb30b39 100644
--- a/pkgs/misc/tex/texlive/xcolor.nix
+++ b/pkgs/misc/tex/texlive/xcolor.nix
@@ -10,12 +10,13 @@ rec {
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
     export HOME=$PWD
+    ensureDir $out/share/
 
-    ensureDir $out/share/texmf/tex/latex/xcolor
-    ensureDir $out/share/texmf/dvips/xcolor
+    ensureDir $out/texmf/tex/latex/xcolor
+    ensureDir $out/texmf/dvips/xcolor
     latex xcolor.ins 
-    cp *.sty *.def $out/share/texmf/tex/latex/xcolor
-    cp *.pro $out/share/texmf/dvips/xcolor
+    cp *.sty *.def $out/texmf/tex/latex/xcolor
+    cp *.pro $out/texmf/dvips/xcolor
 
     #latex xcolor.dtx
     #latex xcolor.dtx
@@ -24,8 +25,10 @@ rec {
     #latex xcolor.dtx
 
     rm *.sty *.pro *.ins *.def *.dtx
-    ensureDir $out/share/texmf/doc/latex-xcolor
-    cp *  $out/share/texmf/doc/latex-xcolor
+    ensureDir $out/texmf/doc/latex-xcolor
+    cp *  $out/texmf/doc/latex-xcolor
+
+    ln -s $out/texmf* $out/share/
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
 
   meta = {