diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-01-17 14:11:43 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-01-17 14:11:43 +0000 |
| commit | 79b352856736ba1e96258b6d07101bcd6284471c (patch) | |
| tree | ce66068f64451f56a54210fefda60bb46e4cc83c /pkgs | |
| parent | d788f078fe8184c8dd398af61055e6c9f5c6d23b (diff) | |
| download | nixlib-79b352856736ba1e96258b6d07101bcd6284471c.tar nixlib-79b352856736ba1e96258b6d07101bcd6284471c.tar.gz nixlib-79b352856736ba1e96258b6d07101bcd6284471c.tar.bz2 nixlib-79b352856736ba1e96258b6d07101bcd6284471c.tar.lz nixlib-79b352856736ba1e96258b6d07101bcd6284471c.tar.xz nixlib-79b352856736ba1e96258b6d07101bcd6284471c.tar.zst nixlib-79b352856736ba1e96258b6d07101bcd6284471c.zip | |
* OpenGL dependency in the i810 driver.
svn path=/nixpkgs/trunk/; revision=4571
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 4 | ||||
| -rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c89fd362829a..bd67f0263f00 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index e9147f5b946d..4484fd2c3f80 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -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"; |