diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-10-22 23:36:07 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2005-10-22 23:36:07 +0000 |
| commit | 7acd7773b44209f2e231abaa93dd3b667603ed40 (patch) | |
| tree | cd227cd79a46dd45ddaf35fa42ca7b08ab24fccb /pkgs/applications/video/mythtv | |
| parent | 0d7780bd714021d15f6595f471edb48398742fbc (diff) | |
| download | nixlib-7acd7773b44209f2e231abaa93dd3b667603ed40.tar nixlib-7acd7773b44209f2e231abaa93dd3b667603ed40.tar.gz nixlib-7acd7773b44209f2e231abaa93dd3b667603ed40.tar.bz2 nixlib-7acd7773b44209f2e231abaa93dd3b667603ed40.tar.lz nixlib-7acd7773b44209f2e231abaa93dd3b667603ed40.tar.xz nixlib-7acd7773b44209f2e231abaa93dd3b667603ed40.tar.zst nixlib-7acd7773b44209f2e231abaa93dd3b667603ed40.zip | |
* Upgraded MythTV to 0.18.1
svn path=/nixpkgs/trunk/; revision=4118
Diffstat (limited to 'pkgs/applications/video/mythtv')
| -rw-r--r-- | pkgs/applications/video/mythtv/builder.sh | 3 | ||||
| -rw-r--r-- | pkgs/applications/video/mythtv/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/video/mythtv/settings.patch | 23 |
3 files changed, 14 insertions, 19 deletions
diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh index d3888175bd91..fc92cab91ab1 100644 --- a/pkgs/applications/video/mythtv/builder.sh +++ b/pkgs/applications/video/mythtv/builder.sh @@ -7,14 +7,11 @@ myBuilder() { make || fail } - postInstall=postInstall postInstall() { sqlDir="$out/share/mythtv/sql" ensureDir $sqlDir cp -p ./database/mc.sql $sqlDir/ - cp -p ./setup/setup $out/bin/mythsetup } - genericBuild diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 21efadbb3880..e6780722566c 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -3,15 +3,16 @@ assert qt3.mysqlSupport; stdenv.mkDerivation { - name = "mythtv-0.17"; + name = "mythtv-0.18.1"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/mythtv-0.17.tar.bz2; - md5 = "c996dc690d36e946396fc5cd4b715e3b"; + url = http://www.mythtv.org/mc/mythtv-0.18.1.tar.bz2; + md5 = "e6cabf88feeaf6ae8f830d3fdf7b113d"; }; patches = [./settings.patch]; + configureFlags = "--disable-joystick-menu"; 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 index f56d7c35d117..bd3824eba904 100644 --- a/pkgs/applications/video/mythtv/settings.patch +++ b/pkgs/applications/video/mythtv/settings.patch @@ -1,13 +1,10 @@ -diff -rc mythtv-0.17-orig/settings.pro mythtv-0.17/settings.pro -*** mythtv-0.17-orig/settings.pro 2005-02-11 05:02:39.000000000 +0100 ---- mythtv-0.17/settings.pro 2005-02-16 13:38:46.351279092 +0100 -*************** -*** 1,6 **** ---- 1,7 ---- - #CONFIG += debug - CONFIG += release - -+ PREFIX = $$(out) - isEmpty( PREFIX ) { - PREFIX = /usr/local - } +diff -urN mythtv-0.18.1-orig/settings.pro mythtv-0.18.1/settings.pro +--- mythtv-0.18.1-orig/settings.pro 2005-10-22 15:32:48.000000000 +0200 ++++ mythtv-0.18.1/settings.pro 2005-10-22 15:35:01.000000000 +0200 +@@ -1,5 +1,6 @@ + CONFIG += $$CCONFIG + ++PREFIX = $$(out) + isEmpty( PREFIX ) { + PREFIX = /usr/local + } |