From 01d749f0aa19a96f3e31c2b116ce3c3cc2317076 Mon Sep 17 00:00:00 2001
From: James Cook <jcook@cs.berkeley.edu>
Date: Thu, 25 Oct 2012 11:18:32 -0700
Subject: [PATCH] Rolled back xf86-video-ati to 6.14.4.

6.14.6 requires a newer version of libdrm, which in turn requires a newer
version of mesa.  I cheated and edited the generated default.nix file instead of
re-generating it, since generate-expr-from-tarballs.pl complained of a collision
between two tarballs providing different versions of xorg-server.
---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8508f87e043f..23600b0e0145 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1438,11 +1438,11 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
     
   xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
-    name = "xf86-video-ati-6.14.6";
+    name = "xf86-video-ati-6.14.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ati-6.14.6.tar.bz2;
-      sha256 = "0dpcdgw7vmx53l3byp900na5s980v1nw11a7y5yps67hwjrqclma";
+      url = mirror://xorg/individual/driver/xf86-video-ati-6.14.4.tar.bz2;
+      sha256 = "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 5511f3f043f9..7b3616362649 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -124,7 +124,7 @@ mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-6.14.6.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-6.14.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2