diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-09-14 01:07:53 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-09-14 01:07:53 +0000 |
commit | ea24b2f64176707778a4bf17db9e323cde589cf9 (patch) | |
tree | fd4caee97d0e80b25eb8ba4d035754ea136123c9 /pkgs/applications/video/mythtv | |
parent | 7c765159ba751459dca69ee2486e8b89c7e27b82 (diff) |
* MythTV 0.20 (doesn't work yet).
svn path=/nixpkgs/trunk/; revision=6519
Diffstat (limited to 'pkgs/applications/video/mythtv')
-rw-r--r-- | pkgs/applications/video/mythtv/builder.sh | 10 | ||||
-rw-r--r-- | pkgs/applications/video/mythtv/default.nix | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh index 0e7bf604f7d6a..daeedf3ae20fa 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 9b6068a39532f..7fc7b9f36ac0d 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; } |