* It compiles!

svn path=/nixpkgs/trunk/; revision=6522
This commit is contained in:
Eelco Dolstra 2006-09-14 20:49:00 +00:00
parent 1014ca2ad5
commit 2d9c5481cf
2 changed files with 9 additions and 6 deletions

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, which, qt3, x11 { stdenv, fetchurl, which, qt3, x11
, libXinerama, libXv, libXxf86vm, libXrandr, libXmu , libX11, libXinerama, libXv, libXxf86vm, libXrandr, libXmu
, lame, zlib, mesa}: , lame, zlib, mesa}:
assert qt3.mysqlSupport; assert qt3.mysqlSupport;
@ -13,13 +13,16 @@ stdenv.mkDerivation {
md5 = "52bec1e0fadf7d24d6dcac3f773ddf74"; md5 = "52bec1e0fadf7d24d6dcac3f773ddf74";
}; };
patches = [./settings.patch]; configureFlags = "--disable-joystick-menu --x11-path=/no-such-path --dvb-path=/no-such-path";
configureFlags = "--disable-joystick-menu";
buildInputs = [ buildInputs = [
which qt3 x11 libXinerama libXv libXxf86vm libXrandr libXmu which qt3 x11
libX11 libXinerama libXv libXxf86vm libXrandr libXmu
lame zlib mesa lame zlib mesa
]; ];
inherit qt3; patches = [
./settings.patch
./purity.patch # don't search in /usr/include etc.
];
} }

View File

@ -2431,7 +2431,7 @@ rec {
mythtv = (import ../applications/video/mythtv) { mythtv = (import ../applications/video/mythtv) {
inherit fetchurl stdenv which qt3 x11 lame zlib mesa; inherit fetchurl stdenv which qt3 x11 lame zlib mesa;
inherit (xlibs) libXinerama libXv libXxf86vm libXrandr libXmu; inherit (xlibs) libX11 libXinerama libXv libXxf86vm libXrandr libXmu;
}; };
gqview = (import ../applications/graphics/gqview) { gqview = (import ../applications/graphics/gqview) {