public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Doh.

Browse Source 
svn path=/nixpkgs/trunk/; revision=8063
This commit is contained in:
Eelco Dolstra 2007-02-26 23:37:41 +00:00
parent ba443448e8
commit 556cc5ed2f
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/x11/xorg/default.nix
View File

@ -2052,8 +2052,8 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2;
sha256 = "0na2qy78waa9jy0ikd10g805v0w048icnkdcss6yd753kffdi37z"; sha256 = "0na2qy78waa9jy0ikd10g805v0w048icnkdcss6yd753kffdi37z";
}; };
buildInputs = [pkgconfig fontsproto glproto libdrm randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC mesaHeaders ]; buildInputs = [pkgconfig fontsproto glproto libdrm mesaHeaders randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ];
}) // {inherit fontsproto glproto libdrm randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;}; }) // {inherit fontsproto glproto libdrm mesaHeaders randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;};
xf86videoimstt = (stdenv.mkDerivation { xf86videoimstt = (stdenv.mkDerivation {
name = "xf86-video-imstt-1.1.0"; name = "xf86-video-imstt-1.1.0";

3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -156,11 +156,9 @@ while (<>) {
sub process { sub process {
my $requires = shift; my $requires = shift;
my $s = shift; my $s = shift;
print "LOOK IN $s\n";
$s =~ s/\[/\ /g; $s =~ s/\[/\ /g;
$s =~ s/\]/\ /g; $s =~ s/\]/\ /g;
$s =~ s/\,/\ /g; $s =~ s/\,/\ /g;
print "AFTER $s\n";
foreach my $req (split / /, $s) { foreach my $req (split / /, $s) {
next if $req eq ">="; next if $req eq ">=";
next if $req =~ /^\$/; next if $req =~ /^\$/;
@ -242,4 +240,3 @@ EOF
print OUT "}\n"; print OUT "}\n";
close OUT; close OUT;
>