From 556cc5ed2fd97bf04ba8d449822965c43c7b62ea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 26 Feb 2007 23:37:41 +0000 Subject: [PATCH] * Doh. svn path=/nixpkgs/trunk/; revision=8063 --- pkgs/servers/x11/xorg/default.nix | 4 ++-- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c8108fbcd12..e5b0c7d0396 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2052,8 +2052,8 @@ rec { url = http://mirror.switch.ch/ftp/mirror/X11/pub/individual/driver/xf86-video-i810-1.7.4.tar.bz2; sha256 = "0na2qy78waa9jy0ikd10g805v0w048icnkdcss6yd753kffdi37z"; }; - buildInputs = [pkgconfig fontsproto glproto libdrm randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC mesaHeaders ]; - }) // {inherit fontsproto glproto libdrm randrproto renderproto libX11 xextproto xf86driproto xineramaproto xorgserver xproto libXvMC ;}; + buildInputs = [pkgconfig fontsproto glproto libdrm mesaHeaders 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 { name = "xf86-video-imstt-1.1.0"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9dbc44bea3a..14fc645c94c 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -156,11 +156,9 @@ while (<>) { sub process { my $requires = shift; my $s = shift; - print "LOOK IN $s\n"; $s =~ s/\[/\ /g; $s =~ s/\]/\ /g; $s =~ s/\,/\ /g; - print "AFTER $s\n"; foreach my $req (split / /, $s) { next if $req eq ">="; next if $req =~ /^\$/; @@ -242,4 +240,3 @@ EOF print OUT "}\n"; close OUT; ->