diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-21 12:33:44 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-21 12:33:44 +0000 |
| commit | 439714b3fa8c47d5488a62bba95ad52d7f7daf68 (patch) | |
| tree | c677d77c6a7db84e27cd72dfc261d7f92b9c7584 /pkgs/desktops | |
| parent | 7582e841e28bddded26f8ff87a2780a914dcd785 (diff) | |
* Allow KDE to find the xkeyboard-config files.
svn path=/nixpkgs/branches/kde-4.7/; revision=27871
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-4.7/workspace.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/desktops/kde-4.7/workspace.nix b/pkgs/desktops/kde-4.7/workspace.nix index e248f2a38e1ce..c87b709aa1d84 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 = { |