1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00

* Added libXxf86vm and xf86vmext from xlibs CVS.

* Added MythTV.  But it doesn't build properly yet (it compiles fine,
  but it ignores the prefix).

svn path=/nixpkgs/trunk/; revision=2077
This commit is contained in:
Eelco Dolstra 2005-01-20 21:11:49 +00:00
parent 6737187428
commit 777c4ea1d7
7 changed files with 58 additions and 3 deletions

View file

@ -10,3 +10,6 @@
* After building gcc, filter out references to /tmp/nix... in
.../lib/libsupc++.la and .../lib/libstdc++.la
* Qt should set QTDIR in all builds that depend on it (using a hook)
[after doing that, update mythtv].

View file

@ -0,0 +1,11 @@
. $stdenv/setup
export QTDIR=$qt3
buildPhase=myBuilder
myBuilder() {
qmake mythtv.pro || fail
make || fail
}
genericBuild

View file

@ -0,0 +1,14 @@
{stdenv, fetchurl, which, qt3, x11, libXinerama, libXv, libXxf86vm, lame}:
stdenv.mkDerivation {
name = "mythtv-0.16";
builder = ./builder.sh;
src = fetchurl {
url = http://www.mythtv.org/mc/mythtv-0.16.tar.bz2;
md5 = "0eba17cf64c96ea3ead23e7e15419cc0";
};
buildInputs = [which qt3 x11 libXinerama libXv libXxf86vm lame];
inherit qt3;
}

View file

@ -86,6 +86,14 @@ rec {
inherit fetchurl stdenv pkgconfig libX11 libXext libXt;
};
xf86vmext = import ./xf86vmext {
inherit fetchurl stdenv;
};
libXxf86vm = import ./libXxf86vm {
inherit fetchurl stdenv pkgconfig libX11 libXext xf86vmext;
};
xlibs = (import ./xlibs) {
inherit stdenv libX11 libXt freetype fontconfig libXft libXext;
};

View file

@ -0,0 +1,11 @@
{stdenv, fetchurl, pkgconfig, libX11, libXext, xf86vmext}:
stdenv.mkDerivation {
name = "libXxf86vm-2.2.0-cvs";
src = fetchurl {
url = http://losser.st-lab.cs.uu.nl/~eelco/dist/libXxf86vm-2.2.0-cvs.tar.bz2;
md5 = "0645a4f18ff720dbeabf5b2ff0fcd82a";
};
buildInputs = [pkgconfig];
propagatedBuildInputs = [libX11 libXext xf86vmext];
}

View file

@ -0,0 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "xf86vmext-2.2-cvs";
src = fetchurl {
url = http://losser.st-lab.cs.uu.nl/~eelco/dist/xf86vmext-2.2-cvs.tar.bz2;
md5 = "5a5818accd51799626b8c6db429907e0";
};
}

View file

@ -918,11 +918,10 @@ rec {
recordingSupport = true;
};
/*
mythtv = (import ../applications/video/mythtv) {
inherit fetchurl stdenv which;
inherit fetchurl stdenv which qt3 x11 lame;
inherit (xlibs) libXinerama libXv libXxf86vm;
};
*/
gqview = (import ../applications/graphics/gqview) {
inherit fetchurl stdenv pkgconfig libpng;