From 8e168422fb11d6ef5d2b686066f5c05a0623bde1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 18 Jul 2010 21:51:33 +0000
Subject: * xkeyboard-config updated to 1.9.

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

(limited to 'pkgs/data')

diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix
index 4fb3a68f5d176..61fc028f5438b 100644
--- a/pkgs/data/misc/xkeyboard-config/default.nix
+++ b/pkgs/data/misc/xkeyboard-config/default.nix
@@ -1,21 +1,17 @@
 {stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}:
 
-let version = "1.5"; in 
-
-stdenv.mkDerivation {
-  name = "xkeyboard-config-${version}";
+stdenv.mkDerivation rec {
+  name = "xkeyboard-config-1.9";
 
   src = fetchurl {
-    url = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${version}.tar.bz2";
-    sha256 = "1r276ik3x0jg77zza37ggrnp7zbdvmjyrm9mwxxgzh3bmligy5ff";
+    url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2";
+    sha256 = "0df2iad598pxw3fzkx10f7irqah0fgawx262d07s04x0whn9ql9b";
   };
 
   buildInputs = [perl perlXMLParser xkbcomp gettext intltool];
 
   patches = [ ./eo.patch ];
 
-  ICONV = "iconv";
-
   preConfigure = ''
     configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86"
     sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh
-- 
cgit 1.4.1