diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-01-20 22:07:08 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-01-20 22:07:08 +0000 |
| commit | 34326de3c22a62951a86cc77d9534542aa490fe9 (patch) | |
| tree | c5233eb1a2c8d0534c07b5a9266b5c82ca2f8b24 /pkgs/applications/video/mythtv | |
| parent | 777c4ea1d75f426fe97f8126b9587238bdf273b9 (diff) | |
* MythTV now installs properly, but it doesn't work yet since Qt has
to be built with MySql client support.
svn path=/nixpkgs/trunk/; revision=2078
Diffstat (limited to 'pkgs/applications/video/mythtv')
| -rw-r--r-- | pkgs/applications/video/mythtv/builder.sh | 6 | ||||
| -rw-r--r-- | pkgs/applications/video/mythtv/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/mythtv/settings.patch | 47 |
3 files changed, 54 insertions, 1 deletions
diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh index 22cc6396c2dd..1208fd63598c 100644 --- a/pkgs/applications/video/mythtv/builder.sh +++ b/pkgs/applications/video/mythtv/builder.sh @@ -2,10 +2,14 @@ export QTDIR=$qt3 + buildPhase=myBuilder myBuilder() { qmake mythtv.pro || fail make || fail } -genericBuild
\ No newline at end of file + +genericBuild + +exit 1
\ No newline at end of file diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index d9019f421dcf..db08db78268a 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation { md5 = "0eba17cf64c96ea3ead23e7e15419cc0"; }; + patches = [./settings.patch]; + buildInputs = [which qt3 x11 libXinerama libXv libXxf86vm lame]; inherit qt3; } diff --git a/pkgs/applications/video/mythtv/settings.patch b/pkgs/applications/video/mythtv/settings.patch new file mode 100644 index 000000000000..e5b8188e00d4 --- /dev/null +++ b/pkgs/applications/video/mythtv/settings.patch @@ -0,0 +1,47 @@ +diff -rc mythtv-0.16/settings.pro mythtv-new/settings.pro +*** mythtv-0.16/settings.pro 2004-09-07 23:20:16.000000000 +0200 +--- mythtv-new/settings.pro 2005-01-20 22:28:45.219407664 +0100 +*************** +*** 1,12 **** + #CONFIG += debug + CONFIG += release + +! PREFIX = /usr/local + + LIBVERSION = 0.16 + + INCLUDEPATH += $${PREFIX}/include +! INCLUDEPATH *= /usr/local/include + + DEFINES += _GNU_SOURCE + DEFINES += _FILE_OFFSET_BITS=64 +--- 1,12 ---- + #CONFIG += debug + CONFIG += release + +! PREFIX = $$(out) + + LIBVERSION = 0.16 + + INCLUDEPATH += $${PREFIX}/include +! #INCLUDEPATH *= /usr/local/include + + DEFINES += _GNU_SOURCE + DEFINES += _FILE_OFFSET_BITS=64 +*************** +*** 39,45 **** + + # Default Xv support + CONFIG += using_xv +! EXTRA_LIBS += -L/usr/X11R6/lib -lXinerama -lXv -lX11 -lXext -lXxf86vm + + # IVTV (PVR-x50) support. Disable if building on Windows. + CONFIG += using_ivtv +--- 39,45 ---- + + # Default Xv support + CONFIG += using_xv +! EXTRA_LIBS += -lXinerama -lXv -lX11 -lXext -lXxf86vm + + # IVTV (PVR-x50) support. Disable if building on Windows. + CONFIG += using_ivtv |