From 4fb36441e20c876efd5a4d3287cca742dc16fa97 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 5 May 2009 12:38:04 +0000
Subject: [PATCH] Override xf86videoati version and make xkbcomp work from
 inside X server

svn path=/nixpkgs/trunk/; revision=15450
---
 pkgs/servers/x11/xorg/overrides.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 82494e42d2bb..4cfa6260063e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -45,8 +45,16 @@
     buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
   };
 
+  xf86videoati = attrs: attrs // {
+    buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
+    src = args.fetchurl {
+      url = ftp://ftp.x.org/pub/individual/driver/xf86-video-ati-6.12.2.tar.bz2;
+      sha256 = "0l17mv7ljw9cnvfblms62vnjkpd26gf5dqgdpfzvkxqrfyhvpvhv";
+    };
+  };
+
   xkbcomp = attrs: attrs // {
-    NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\"/etc/X11/xkb\"";
+    NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\"";
   };
 
   xorgserver = attrs: attrs // {