public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4787 from titanous/mythtv

Browse Source 
mythtv: 0.24.2 -> 0.27.4
This commit is contained in:
cillianderoiste 2014-11-02 21:53:21 +01:00
commit fbd3a38540
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -137,6 +137,7 @@
thammers = "Tobias Hammerschmidt <jawr@gmx.de>"; thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>"; the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
thoughtpolice = "Austin Seipp <aseipp@pobox.com>"; thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
titanous = "Jonathan Rudenberg <jonathan@titanous.com>";
tomberek = "Thomas Bereknyei <tomberek@gmail.com>"; tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
tstrobel = "Thomas Strobel <ts468@cam.ac.uk>"; tstrobel = "Thomas Strobel <ts468@cam.ac.uk>";
ttuegel = "Thomas Tuegel <ttuegel@gmail.com>"; ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";

22
pkgs/applications/video/mythtv/default.nix
View File

@ -1,22 +1,32 @@
{ stdenv, fetchurl, which, qt4, x11, pulseaudio, fftwSinglePrec { stdenv, fetchurl, which, qt4, x11, pulseaudio, fftwSinglePrec
, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig , lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig
, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu
, yasm, libuuid, taglib, libtool, autoconf, automake, file
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mythtv-0.24.2"; name = "mythtv-${version}";
version = "0.27.4";
src = fetchurl { src = fetchurl {
url = "http://ftp.osuosl.org/pub/mythtv/${name}.tar.bz2"; url = "https://github.com/MythTV/mythtv/archive/v${version}.tar.gz";
sha256 = "14mkyf2b26pc9spx6lg15mml0nqyg1r3qnq8m9dz3110h771y2db"; sha256 = "0nrn4fbkkzh43n7jgbv21i92sb4z4yacwj9yj6m3hjbffzy4ywqz";
}; };
sourceRoot = "${name}/mythtv";
buildInputs = [ buildInputs = [
freetype qt4 lame zlib x11 mesa perl alsaLib pulseaudio fftwSinglePrec freetype qt4 lame zlib x11 mesa perl alsaLib pulseaudio fftwSinglePrec
libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu
libuuid taglib
]; ];
nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ];
nativeBuildInputs = [ pkgconfig which ]; meta = with stdenv.lib; {
homepage = "https://www.mythtv.org/";
patches = [ ./settings.patch ]; description = "Open Source DVR";
license = licenses.gpl2;
meta.platforms = platforms.linux;
maintainers = [ maintainers.titanous ];
};
} }

13
pkgs/applications/video/mythtv/settings.patch
View File

@ -1,13 +0,0 @@
diff --git a/Makefile b/Makefile
index 05db819..383036d 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ i18n/Makefile: i18n/i18n.pro
locales/Makefile: locales/locales.pro
$(addsuffix /Makefile,$(QT_SUBDIRS)): %/Makefile :
- cd $*; $(QMAKE) QMAKE=$(QMAKE) -o $(@F) $(<F)
+ cd $*; $(QMAKE) QMAKE=$(QMAKE) PREFIX=${PREFIX} -o $(@F) $(<F)
$(SUBDIRS): $(addsuffix /Makefile,$(SUBDIRS)) version.cpp
$(MAKE) -C $@