From 8045c6ebe2ba1b6a2079eef10a11d89958de8c55 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Jan 2012 18:47:40 +0000
Subject: [PATCH] dri-proto: upgraded to version 2.6 so that we can use intel
 2.17 driver

svn path=/nixpkgs/trunk/; revision=31773
---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.6.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 42e89d436492..296dac46cbae 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -68,11 +68,11 @@ let
   })) // {inherit ;};
     
   dri2proto = (stdenv.mkDerivation ((if overrides ? dri2proto then overrides.dri2proto else x: x) {
-    name = "dri2proto-2.3";
+    name = "dri2proto-2.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/dri2proto-2.3.tar.bz2;
-      sha256 = "0xz6nf5rrn1fvply5mq7dd1w89r73mggylp9lpzzwdfvl291h55j";
+      url = mirror://xorg/individual/proto/dri2proto-2.6.tar.bz2;
+      sha256 = "02drlfqvjm2q7dvkkwli3fs2crb6rdb3kyd13vwx7z0rijrc10md";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
index c2fe1c77b659..27cd5ca5d827 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@@ -3,7 +3,7 @@ mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2
-mirror://xorg/X11R7.6/src/everything/dri2proto-2.3.tar.bz2
+mirror://xorg/individual/proto/dri2proto-2.6.tar.bz2
 mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2