Author: urkud
Date: Fri Mar 16 22:26:26 2012
New Revision: 33180
URL: https://nixos.org/websvn/nix/?rev=33180&sc=1
Log:
mythth-0.24.2
New dependencies:
* Qt4
* Pulseaudio (optional but I've hardcoded it)
* fftw (single precision)
Deleted:
nixpkgs/trunk/pkgs/applications/video/mythtv/builder.sh
nixpkgs/trunk/pkgs/applications/video/mythtv/purity.patch
Modified:
nixpkgs/trunk/pkgs/applications/video/mythtv/default.nix
nixpkgs/trunk/pkgs/applications/video/mythtv/settings.patch
Modified: nixpkgs/trunk/pkgs/applications/video/mythtv/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/video/mythtv/default.nix Fri Mar 16
22:22:50 2012 (r33179)
+++ nixpkgs/trunk/pkgs/applications/video/mythtv/default.nix Fri Mar 16
22:26:26 2012 (r33180)
@@ -1,36 +1,22 @@
-a@{ stdenv, fetchurl, which, qt3, x11, xlibs
-, lame, zlib, mesa, alsaLib
-, freetype, perl
+{ stdenv, fetchurl, which, qt4, x11, pulseaudio, fftwSinglePrec
+, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig
+, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu
}:
-let
- qt3 = a.qt3.override { mysqlSupport = true; };
-in
+stdenv.mkDerivation rec {
+ name = "mythtv-0.24.2";
-stdenv.mkDerivation {
- name = "mythtv-0.21";
-
- builder = ./builder.sh;
-
src = fetchurl {
- url = http://ftp.osuosl.org/pub/mythtv/mythtv-0.21.tar.bz2;
- sha256 = "1r654fvklpsf6h9iqckb8fhd7abgs71lx6xh352xgz9yzjl7ia1k";
+ url = "http://ftp.osuosl.org/pub/mythtv/${name}.tar.bz2";;
+ sha256 = "14mkyf2b26pc9spx6lg15mml0nqyg1r3qnq8m9dz3110h771y2db";
};
- #configureFlags = "--x11-path=/no-such-path --dvb-path=/no-such-path";
-
- configureFlags = ''
- --disable-joystick-menu --disable-dvb
- '';
-
buildInputs = [
- freetype qt3 lame zlib x11 mesa perl alsaLib
- xlibs.libX11 xlibs.libXv xlibs.libXrandr xlibs.libXvMC xlibs.libXmu
- xlibs.libXinerama xlibs.libXxf86vm xlibs.libXmu
- ];
-
- patches = [
- ./settings.patch
- ./purity.patch # don't search in /usr/include etc.
+ freetype qt4 lame zlib x11 mesa perl alsaLib pulseaudio fftwSinglePrec
+ libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu
];
+
+ buildNativeInputs = [ pkgconfig which ];
+
+ patches = [ ./settings.patch ];
}
Modified: nixpkgs/trunk/pkgs/applications/video/mythtv/settings.patch
==============================================================================
--- nixpkgs/trunk/pkgs/applications/video/mythtv/settings.patch Fri Mar 16
22:22:50 2012 (r33179)
+++ nixpkgs/trunk/pkgs/applications/video/mythtv/settings.patch Fri Mar 16
22:26:26 2012 (r33180)
@@ -1,10 +1,13 @@
-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
+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
-+PREFIX = $$(out)
- isEmpty( PREFIX ) {
- PREFIX = /usr/local
- }
+ $(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 $@
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
