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

KDE: Solid: compile in bluetooth support

Browse Source 
svn path=/nixpkgs/trunk/; revision=23888
This commit is contained in:
Evgeny Egorochkin 2010-09-22 00:39:38 +00:00
parent 93e22996b1
commit 748fa38a35
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/kde-4.4/base-workspace/default.nix
View File

@ -3,6 +3,7 @@
, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver
, lm_sensors, libxklavier, libusb, libpthreadstubs, boost , lm_sensors, libxklavier, libusb, libpthreadstubs, boost
, automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt , automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt
, bluez
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -14,7 +15,7 @@ stdenv.mkDerivation {
buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp
libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 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='' patchPhase=''
sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \ sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \
plasma/generic/scriptengines/python/CMakeLists.txt plasma/generic/scriptengines/python/CMakeLists.txt

1
pkgs/desktops/kde-4.4/default.nix
View File

@ -74,6 +74,7 @@ pkgs.recurseIntoAttrs (rec {
inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs; inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs;
inherit kdelibs kdepimlibs kdebindings; inherit kdelibs kdepimlibs kdebindings;
inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt; inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt;
inherit (pkgs) bluez;
}; };
kdebase = import ./base { kdebase = import ./base {