From 337e26fea0351d0b24f2ced9f51e3f5090cc4332 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 11 Feb 2011 15:32:08 +0000
Subject: [PATCH] * xkbcomp 1.2.1.

svn path=/nixpkgs/branches/x-updates/; revision=25906
---
 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 7d39fa527770..dd90aedc4e2d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1918,11 +1918,11 @@ let
   })) // {inherit inputproto libX11 libXext libXi ;};
     
   xkbcomp = (stdenv.mkDerivation ((if overrides ? xkbcomp then overrides.xkbcomp else x: x) {
-    name = "xkbcomp-1.2.0";
+    name = "xkbcomp-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xkbcomp-1.2.0.tar.bz2;
-      sha256 = "193ywzx2plvg4azidjhvw3avpdgpjlzckrcaak569rsm8x0slr1c";
+      url = mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2;
+      sha256 = "1sv51rliqs6wygrp2hc79a5pgn6ly0bbr4sa8a8x00j4j4kjaqdp";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
   })) // {inherit libX11 libxkbfile ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
index 3f434dbf6172..6a745887ca43 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@@ -174,7 +174,7 @@ mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2
 mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xkbcomp-1.2.0.tar.bz2
+mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2