Merge remote-tracking branch 'origin/master' into stdenv-updates.

Conflicts:
	pkgs/top-level/all-packages.nix
This commit is contained in:
Peter Simons
2013-10-26 18:28:05 +02:00
156 changed files with 2797 additions and 844 deletions

View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses perl xz ];
preInstall = ''
installFlags="TEXMF=$out/texmf";
installFlags="TEXMF=$out/texmf-dist";
installTargets="install install-tex";
'';