7 files changed, 58 insertions, 3 deletions
diff --git a/pkgs/TODO b/pkgs/TODO
index c63a40d85bc6..13fb86068be8 100644
--- a/pkgs/TODO
+++ b/pkgs/TODO
@@ -10,3 +10,6 @@
 
 * After building gcc, filter out references to /tmp/nix... in
   .../lib/libsupc++.la and .../lib/libstdc++.la
+
+* Qt should set QTDIR in all builds that depend on it (using a hook)
+  [after doing that, update mythtv].
diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh
new file mode 100644
index 000000000000..22cc6396c2dd
--- /dev/null
+++ b/pkgs/applications/video/mythtv/builder.sh
@@ -0,0 +1,11 @@
+. $stdenv/setup
+
+export QTDIR=$qt3
+
+buildPhase=myBuilder
+myBuilder() {
+    qmake mythtv.pro || fail
+    make || fail
+}
+
+genericBuild
\ No newline at end of file
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
new file mode 100644
index 000000000000..d9019f421dcf
--- /dev/null
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -0,0 +1,14 @@
+{stdenv, fetchurl, which, qt3, x11, libXinerama, libXv, libXxf86vm, lame}:
+
+stdenv.mkDerivation {
+  name = "mythtv-0.16";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.mythtv.org/mc/mythtv-0.16.tar.bz2;
+    md5 = "0eba17cf64c96ea3ead23e7e15419cc0";
+  };
+
+  buildInputs = [which qt3 x11 libXinerama libXv libXxf86vm lame];
+  inherit qt3;
+}
diff --git a/pkgs/development/libraries/xlibs/default.nix b/pkgs/development/libraries/xlibs/default.nix
index 9dd17d6759d5..973d160a7d02 100644
--- a/pkgs/development/libraries/xlibs/default.nix
+++ b/pkgs/development/libraries/xlibs/default.nix
@@ -86,6 +86,14 @@ rec {
     inherit fetchurl stdenv pkgconfig libX11 libXext libXt;
   };
 
+  xf86vmext = import ./xf86vmext {
+    inherit fetchurl stdenv;
+  };
+
+  libXxf86vm = import ./libXxf86vm {
+    inherit fetchurl stdenv pkgconfig libX11 libXext xf86vmext;
+  };
+
   xlibs = (import ./xlibs) {
     inherit stdenv libX11 libXt freetype fontconfig libXft libXext;
   };
diff --git a/pkgs/development/libraries/xlibs/libXxf86vm/default.nix b/pkgs/development/libraries/xlibs/libXxf86vm/default.nix
new file mode 100644
index 000000000000..de6990b2db87
--- /dev/null
+++ b/pkgs/development/libraries/xlibs/libXxf86vm/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, pkgconfig, libX11, libXext, xf86vmext}:
+
+stdenv.mkDerivation {
+  name = "libXxf86vm-2.2.0-cvs";
+  src = fetchurl {
+    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/libXxf86vm-2.2.0-cvs.tar.bz2;
+    md5 = "0645a4f18ff720dbeabf5b2ff0fcd82a";
+  };
+  buildInputs = [pkgconfig];
+  propagatedBuildInputs = [libX11 libXext xf86vmext];
+}
diff --git a/pkgs/development/libraries/xlibs/xf86vmext/default.nix b/pkgs/development/libraries/xlibs/xf86vmext/default.nix
new file mode 100644
index 000000000000..34d5af4ca0b8
--- /dev/null
+++ b/pkgs/development/libraries/xlibs/xf86vmext/default.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "xf86vmext-2.2-cvs";
+  src = fetchurl {
+    url = http://losser.st-lab.cs.uu.nl/~eelco/dist/xf86vmext-2.2-cvs.tar.bz2;
+    md5 = "5a5818accd51799626b8c6db429907e0";
+  };
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 77a362244142..0f9f3f9eeb04 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -918,11 +918,10 @@ rec {
     recordingSupport = true;
   };
 
-  /*
   mythtv = (import ../applications/video/mythtv) {
-    inherit fetchurl stdenv which;
+    inherit fetchurl stdenv which qt3 x11 lame;
+    inherit (xlibs) libXinerama libXv libXxf86vm;
   };
-  */
 
   gqview = (import ../applications/graphics/gqview) {
     inherit fetchurl stdenv pkgconfig libpng;