public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Allow KDE to find the xkeyboard-config files.

Browse Source 
svn path=/nixpkgs/branches/kde-4.7/; revision=27871
This commit is contained in:
Eelco Dolstra 2011-07-21 12:33:44 +00:00
parent 7582e841e2
commit 439714b3fa
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/kde-4.7/workspace.nix
View File

@ -1,7 +1,7 @@
{ automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt { automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
, xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394 , xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
, libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit , libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
, phonon , phonon, xkeyboard_config
}: }:
kde.package { kde.package {
@ -23,6 +23,10 @@ kde.package {
'' ''
# Fix incorrect path to kde4-config. # Fix incorrect path to kde4-config.
substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/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 = { meta = {