* OpenGL dependency in the i810 driver.
svn path=/nixpkgs/trunk/; revision=4571
This commit is contained in:
parent
d788f078fe
commit
79b3528567
|
@ -2002,8 +2002,8 @@ rec {
|
|||
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/xf86-video-i810-X11R7.0-1.4.1.3.tar.bz2;
|
||||
md5 = "fe6bec726fc1657b537508bbe8c2005b";
|
||||
};
|
||||
buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ];
|
||||
}) // {inherit fontsproto libdrm randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ;};
|
||||
buildInputs = [pkgconfig fontsproto glproto libdrm mesa randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ];
|
||||
}) // {inherit fontsproto glproto libdrm mesa randrproto renderproto libX11 xextproto xf86driproto xorgserver xproto libXvMC ;};
|
||||
|
||||
xf86videoimstt = (stdenv.mkDerivation {
|
||||
name = "xf86-video-imstt-1.0.0.5";
|
||||
|
|
|
@ -120,6 +120,7 @@ while (<>) {
|
|||
next if $req =~ /^[0-9]/;
|
||||
$req =~ s/\[//g;
|
||||
$req =~ s/\]//g;
|
||||
next if $req =~ /^\s*$/;
|
||||
print "REQUIRE: $req\n";
|
||||
push @{$requires}, $req;
|
||||
}
|
||||
|
@ -131,7 +132,8 @@ while (<>) {
|
|||
process \@requires, $1 while $file =~ /REQUIRES=\"(.*)\"/g;
|
||||
process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g;
|
||||
|
||||
push @requires, "mesa" if $pkg =~ /xorgserver/;
|
||||
push @requires, "mesa" if $pkg =~ /xorgserver/ or $pkg =~ /xf86videoi810/;
|
||||
push @requires, "glproto" if $pkg =~ /xf86videoi810/;
|
||||
push @requires, "zlib" if $pkg =~ /xorgserver/;
|
||||
|
||||
print "REQUIRES @requires => $pkg\n";
|
||||
|
|
Loading…
Reference in a new issue