From 5ebdf058cc5f8fbbcd680cbecbc06a04435555b3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Jan 2012 20:38:30 +0000
Subject: [PATCH] intel X driver: upgraded to fix display glitches on newer
chips
at least 2 nixos users were affected by a graphics bug that got fixed
in 2.15.
Officially 2.15 was meant for a newer xorg server, libdrm, mesa and all, but
I've been running with this for over a month with no issues (used
compositing desktop, opengl and hd video).
I know 2.17 is in the repo, but it doesn't builde (missing deps I
think).
svn path=/nixpkgs/trunk/; revision=31661
---
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 8342c4f7d229..42e89d436492 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1568,11 +1568,11 @@ let
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
- name = "xf86-video-intel-2.14.0";
+ name = "xf86-video-intel-2.15.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2;
- sha256 = "1pq7nm6whc2nmrizf774q042580cfms6yp6yd5p52q59g6jkg371";
+ url = mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2;
+ sha256 = "080pkhjp910wy36crpgi0dmcwpcx8w2r3k4s0dz6v14bmgly2xy3";
};
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ];
})) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
index 250faabfa177..c2fe1c77b659 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@@ -137,7 +137,7 @@ mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-intel-2.14.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2
mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2