From ea24b2f64176707778a4bf17db9e323cde589cf9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Sep 2006 01:07:53 +0000
Subject: [PATCH] * MythTV 0.20 (doesn't work yet).

svn path=/nixpkgs/trunk/; revision=6519
---
 pkgs/applications/video/mythtv/builder.sh  | 10 ++++++++++
 pkgs/applications/video/mythtv/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix            |  4 ++--
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh
index 0e7bf604f7d..daeedf3ae20 100644
--- a/pkgs/applications/video/mythtv/builder.sh
+++ b/pkgs/applications/video/mythtv/builder.sh
@@ -1,12 +1,21 @@
 source $stdenv/setup
 
 
+# Hack - MythTV's configure searches LD_LIBRARY_PATH for its
+# dependencies.
+for i in $buildInputs; do
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}$i/lib
+done
+echo $LD_LIBRARY_PATH
+
+
 buildPhase=myBuilder
 myBuilder() {
     qmake mythtv.pro || fail
     make || fail
 }
 
+
 postInstall=postInstall
 postInstall() {
     sqlDir="$out/share/mythtv/sql"
@@ -14,4 +23,5 @@ postInstall() {
     cp -p ./database/mc.sql $sqlDir/
 }
 
+
 genericBuild
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 9b6068a3953..7fc7b9f36ac 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -1,19 +1,19 @@
-{stdenv, fetchurl, which, qt3, x11, libXinerama, libXv, libXxf86vm, lame}:
+{stdenv, fetchurl, which, qt3, x11, libXinerama, libXv, libXxf86vm, libXrandr, lame, zlib}:
 
 assert qt3.mysqlSupport;
 
 stdenv.mkDerivation {
-  name = "mythtv-0.18.1";
+  name = "mythtv-0.20";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/mythtv-0.18.1.tar.bz2;
-    md5 = "e6cabf88feeaf6ae8f830d3fdf7b113d";
+    url = http://ftp.osuosl.org/pub/mythtv/mythtv-0.20.tar.bz2;
+    md5 = "52bec1e0fadf7d24d6dcac3f773ddf74";
   };
 
   patches = [./settings.patch];
   configureFlags = "--disable-joystick-menu";
 
-  buildInputs = [which qt3 x11 libXinerama libXv libXxf86vm lame];
+  buildInputs = [which qt3 x11 libXinerama libXv libXxf86vm libXrandr lame zlib];
   inherit qt3;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78788091da2..39295773e9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2428,8 +2428,8 @@ rec {
   };
 
   mythtv = (import ../applications/video/mythtv) {
-    inherit fetchurl stdenv which qt3 x11 lame;
-    inherit (xlibs) libXinerama libXv libXxf86vm;
+    inherit fetchurl stdenv which qt3 x11 lame zlib;
+    inherit (xlibs) libXinerama libXv libXxf86vm libXrandr;
   };
 
   gqview = (import ../applications/graphics/gqview) {