From 62478d6e0e3a12ac4caa092a936c08a0d343e1cb Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Thu, 27 Mar 2008 23:33:10 +0000
Subject: [PATCH] lyx version update, use texLive instead of tetex

svn path=/nixpkgs/trunk/; revision=11315
---
 pkgs/applications/misc/lyx/default.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix        |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 246b8caa3ca..a53b4a382a0 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -1,14 +1,14 @@
 # I haven't put much effort into this expressions .. so some optional depencencies may be missing - Marc
-args:
-args.stdenv.mkDerivation {
-  name = "lyx-1.5.3";
+args: with args;
+stdenv.mkDerivation {
+  name = "lyx-1.5.4";
 
-  src = args.fetchurl {
-    url = http://lyx.cybermirror.org/stable/lyx-1.5.3.tar.bz2;
-    sha256 = "1q0xlhrvj87iw9rk9z2vfka4jw5pw7n5fsmmiyzram9y4hghavav";
+  src = fetchurl {
+    url = http://lyx.cybermirror.org/stable/lyx-1.5.4.tar.bz2;
+    sha256 = "6c8b9aafc287ee683b68ebb08166e660e27af9942a30291f14c18de39aca8f2b";
   };
 
-  buildInputs =(with args; [tetex qt python]);
+  buildInputs = [texLive qt python];
 
   meta = { 
       description = "WYSIWYM frontend for LaTeX, DocBook, etc.";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8643429d7e..29bf8325166 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5245,7 +5245,7 @@ let pkgs = rec {
   };
 
   lyx = import ../applications/misc/lyx {
-   inherit fetchurl stdenv tetex python;
+   inherit fetchurl stdenv texLive python;
    qt = qt4;
   };