From 7582e841e28bddded26f8ff87a2780a914dcd785 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 12:14:20 +0000
Subject: [PATCH] * Update xkeyboard-config to 2.1. (The latest version, 2.3,
requires a newer version of libX11 than we have.)
svn path=/nixpkgs/branches/kde-4.7/; revision=27870
---
pkgs/data/misc/xkeyboard-config/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix
index 61fc028f5438..63357fb45a32 100644
--- a/pkgs/data/misc/xkeyboard-config/default.nix
+++ b/pkgs/data/misc/xkeyboard-config/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}:
+{ stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool }:
stdenv.mkDerivation rec {
- name = "xkeyboard-config-1.9";
+ name = "xkeyboard-config-2.1";
src = fetchurl {
url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2";
- sha256 = "0df2iad598pxw3fzkx10f7irqah0fgawx262d07s04x0whn9ql9b";
+ sha256 = "0x9hkb4iqz64gcabzkdcfy4p78sdhnpjwh54g8wx5bdgy9087vpr";
};
- buildInputs = [perl perlXMLParser xkbcomp gettext intltool];
+ buildInputs = [ perl perlXMLParser xkbcomp gettext intltool ];
patches = [ ./eo.patch ];