From 439714b3fa8c47d5488a62bba95ad52d7f7daf68 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 12:33:44 +0000
Subject: [PATCH] * Allow KDE to find the xkeyboard-config files.

svn path=/nixpkgs/branches/kde-4.7/; revision=27871
---
 pkgs/desktops/kde-4.7/workspace.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix
index e248f2a38e1..c87b709aa1d 100644
--- a/pkgs/desktops/kde-4.7/workspace.nix
+++ b/pkgs/desktops/kde-4.7/workspace.nix
@@ -1,7 +1,7 @@
 { automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
 , xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
 , libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
-, phonon
+, phonon, xkeyboard_config
 }:
 
 kde.package {
@@ -23,6 +23,10 @@ kde.package {
    ''
      # Fix incorrect path to kde4-config.
      substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
+
+     # Fix the path to the keyboard configuration files.
+     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
+       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
    '';
 
   meta = {