From 1a4d1facda6c0686449acb2bc55a3299219aa133 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 May 2012 21:30:03 +0000
Subject: * xkeyboard-config updated to 2.5.1.

svn path=/nixpkgs/branches/x-updates/; revision=34127
---
 pkgs/data/misc/xkeyboard-config/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/data/misc/xkeyboard-config')

diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix
index fbe8e7ce1f5b..d4d5437e89f4 100644
--- a/pkgs/data/misc/xkeyboard-config/default.nix
+++ b/pkgs/data/misc/xkeyboard-config/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool  }:
 
 stdenv.mkDerivation rec {
-  name = "xkeyboard-config-2.1";
+  name = "xkeyboard-config-2.5.1";
 
   src = fetchurl {
-    url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2";
-    sha256 = "0x9hkb4iqz64gcabzkdcfy4p78sdhnpjwh54g8wx5bdgy9087vpr";
+    url = "mirror://xorg/individual/data/${name}.tar.bz2";
+    sha256 = "14ncsbzi8l1dw0ypd36az9kxvrsqfspl3w51zj5p52f373ffi07b";
   };
 
   buildInputs = [ gettext ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   patches = [ ./eo.patch ];
 
   preConfigure = ''
-    configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86"
+    configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86 --disable-runtime-deps"
     sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh
   '';
 
-- 
cgit 1.4.1