From 748fa38a35170e99e6cb8fb6c9737e9883527c28 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Wed, 22 Sep 2010 00:39:38 +0000 Subject: [PATCH] KDE: Solid: compile in bluetooth support svn path=/nixpkgs/trunk/; revision=23888 --- pkgs/desktops/kde-4.4/base-workspace/default.nix | 3 ++- pkgs/desktops/kde-4.4/default.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.4/base-workspace/default.nix b/pkgs/desktops/kde-4.4/base-workspace/default.nix index 5615ba74bd7..577ed62812f 100644 --- a/pkgs/desktops/kde-4.4/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.4/base-workspace/default.nix @@ -3,6 +3,7 @@ , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver , lm_sensors, libxklavier, libusb, libpthreadstubs, boost , automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt +, bluez }: stdenv.mkDerivation { @@ -14,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 - phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs ]; + phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs bluez ]; patchPhase='' sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \ plasma/generic/scriptengines/python/CMakeLists.txt diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 43ce2fff731..e7a6ec3ca1b 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -74,6 +74,7 @@ pkgs.recurseIntoAttrs (rec { inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs; inherit kdelibs kdepimlibs kdebindings; inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt; + inherit (pkgs) bluez; }; kdebase = import ./base {