diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-19 11:16:24 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-19 11:16:24 +0000 |
commit | 313a029f160e919a68e7c9705e631daf29d341b7 (patch) | |
tree | 3291ae38e4ff296e14d1af6b935c443e31cf4469 /pkgs/desktops/kde-4.7/kde-workspace.nix | |
parent | cdece697738e65c95183ae248fd4ef2e9ed4b439 (diff) | |
parent | 668a5052142eab0b67a54160c9d299db78a2ce5d (diff) |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
Diffstat (limited to 'pkgs/desktops/kde-4.7/kde-workspace.nix')
-rw-r--r-- | pkgs/desktops/kde-4.7/kde-workspace.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix index 277bdd62634aa..20fc5b5645549 100644 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ b/pkgs/desktops/kde-4.7/kde-workspace.nix @@ -1,13 +1,13 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies , lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate , consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi -, pykde4 +, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc }: kde { buildInputs = - [ kdelibs qimageblitz libdbusmenu_qt pykde4 + [ kdelibs qimageblitz libdbusmenu_qt pykde4 libjpeg libXft libXxf86misc xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs @@ -15,6 +15,8 @@ kde { libusb python libqalculate consolekit kdepimlibs pam prison akonadi ]; + buildNativeInputs = [ pkgconfig ]; + preConfigure = '' # Fix incorrect path to kde4-config. |