Really add policykit support to kdebase-workspace

svn path=/nixpkgs/trunk/; revision=21329
This commit is contained in:
Yury G. Kudryashov 2010-04-26 20:39:08 +00:00
parent de5c9fd9bc
commit a4842e0987
2 changed files with 11 additions and 6 deletions

View file

@ -2,7 +2,7 @@
, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings , qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings
, 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, policykit
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -11,10 +11,15 @@ stdenv.mkDerivation {
url = mirror://kde/stable/4.4.2/src/kdebase-workspace-4.4.2.tar.bz2; url = mirror://kde/stable/4.4.2/src/kdebase-workspace-4.4.2.tar.bz2;
sha256 = "1g8rnpwpihk6sgvils9cafxz017d23ksg5i9x9275ilydslbsclc"; sha256 = "1g8rnpwpihk6sgvils9cafxz017d23ksg5i9x9275ilydslbsclc";
}; };
buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs kdepimlibs kdebindings libpthreadstubs boost libusb stdenv.gcc.libc buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst
libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp
lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ]; libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4
builder = ./builder.sh; phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs
policykit ];
patchPhase=''
sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \
plasma/generic/scriptengines/python/CMakeLists.txt
'';
meta = { meta = {
description = "KDE Workspace"; description = "KDE Workspace";
longDescription = "KDE base components that are only required to work with X11 such KDM and KWin"; longDescription = "KDE base components that are only required to work with X11 such KDM and KWin";

View file

@ -69,7 +69,7 @@ pkgs.recurseIntoAttrs (rec {
### BASE ### BASE
kdebase_workspace = import ./base-workspace { kdebase_workspace = import ./base-workspace {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4; inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4;
inherit (pkgs) lm_sensors libxklavier libusb boost consolekit; inherit (pkgs) lm_sensors libxklavier libusb boost consolekit policykit;
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;