From 34460a0b568c6e84b568069701b46525ac3438f6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Apr 2008 20:23:26 +0000
Subject: [PATCH] Moved pidgin-latex to TeXLive

svn path=/nixpkgs/trunk/; revision=11658
---
 .../pidgin-plugins/pidgin-latex/default.nix                 | 6 +++---
 pkgs/top-level/all-packages.nix                             | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
index 95664d0fbeb5..f6700a2e0fcd 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, pidgin, imagemagick, ghostscript,
-	pkgconfig, glib, gtk, tetex}:
+	pkgconfig, glib, gtk, texLive}:
 stdenv.mkDerivation {
   name = "pidgin-latex";
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   preBuild = "
   	sed -e '/^PREFIX/d' -i Makefile ; 
-	sed -e 's@/usr/bin/latex@${tetex}/bin/pdflatex@g' -i pidgin-latex.h
+	sed -e 's@/usr/bin/latex@${texLive}/bin/pdflatex@g' -i pidgin-latex.h
 	sed -e 's@/usr/bin/convert@${imagemagick}/bin/convert@g' -i pidgin-latex.h
 	sed -e 's@.*convert_path.*@const gchar *convert = CONVERT_PATH;@'
 	sed -e 's@.*latex_path.*@const gchar *convert = LATEX_PATH;@'
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   postInstall = "mkdir -p \${out}/share/pidgin-latex; 
 	ln -s \${out}/lib/pidgin/pidgin-latex.so \${out}/share/pidgin-latex/";
 
-  buildInputs = [pidgin imagemagick ghostscript pkgconfig glib gtk tetex];
+  buildInputs = [pidgin imagemagick ghostscript pkgconfig glib gtk texLive];
 
   meta = {
     description = "
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5f53210e88d..fcf5a0ae70bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5198,11 +5198,12 @@ let pkgs = rec {
     inherit (xlibs) libXScrnSaver;
   };
 
-  pidginlatex = import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex {
-    inherit fetchurl stdenv tetex pkgconfig ghostscript pidgin;
+  pidginlatexFun = lib.sumArgs (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex) {
+    inherit fetchurl stdenv pkgconfig ghostscript pidgin texLive;
     imagemagick = imagemagickBig;
     inherit (gtkLibs) glib gtk;
   };
+  pidginlatex = pidginlatexFun null;
 
   pidginotr = import ../applications/networking/instant-messengers/pidgin-plugins/otr {
     inherit fetchurl stdenv libotr pidgin;