From db9fc16b70225e50470ce4bf85968dfa8e171632 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jul 2011 16:23:48 +0000
Subject: [PATCH] moderncv: cleanup the build instructions

Just add this package to texLiveAggregationFun to install it.

svn path=/nixpkgs/trunk/; revision=27765
---
 pkgs/misc/tex/texlive/moderncv.nix | 9 +++++----
 pkgs/top-level/all-packages.nix    | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/tex/texlive/moderncv.nix b/pkgs/misc/tex/texlive/moderncv.nix
index a3bd7aa29c2..2ddde10200b 100644
--- a/pkgs/misc/tex/texlive/moderncv.nix
+++ b/pkgs/misc/tex/texlive/moderncv.nix
@@ -9,10 +9,11 @@ rec {
   buildInputs = [texLive unzip];
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    ensureDir $out/share
-    cp -r texmf* $out/
-    ln -s $out/texmf* $out/share
-  '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
+    ensureDir $out/texmf/tex/latex/moderncv $out/texmf/doc $out/share
+    mv *.cls *.sty $out/texmf/tex/latex/moderncv/
+    mv examples $out/texmf/doc/moderncv
+    ln -s $out/texmf* $out/share/
+  '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
 
   meta = {
     description = "Extra components for TeXLive";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95deda799b1..583d939ef99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8114,7 +8114,7 @@ let
   };
 
   texLiveModerncv = builderDefsPackage (import ../misc/tex/texlive/moderncv.nix) {
-    inherit texLive;
+    inherit texLive unzip;
   };
 
   trac = callPackage ../misc/trac {