Author: eelco
Date: Thu Jul 21 12:33:44 2011
New Revision: 27871
URL: https://svn.nixos.org/websvn/nix/?rev=27871&sc=1
Log:
* Allow KDE to find the xkeyboard-config files.
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix Thu Jul
21 12:14:20 2011 (r27870)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix Thu Jul
21 12:33:44 2011 (r27871)
@@ -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 @@
''
# 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 = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
