diff --git a/pkgs/desktops/kde-4.4/base-workspace/default.nix b/pkgs/desktops/kde-4.4/base-workspace/default.nix index 6f682e3029d..48a70a01d11 100644 --- a/pkgs/desktops/kde-4.4/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.4/base-workspace/default.nix @@ -2,7 +2,7 @@ , qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver , 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 { @@ -11,10 +11,15 @@ stdenv.mkDerivation { url = mirror://kde/stable/4.4.2/src/kdebase-workspace-4.4.2.tar.bz2; sha256 = "1g8rnpwpihk6sgvils9cafxz017d23ksg5i9x9275ilydslbsclc"; }; - buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs kdepimlibs kdebindings libpthreadstubs boost libusb stdenv.gcc.libc - libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver - lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ]; - builder = ./builder.sh; + 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 + 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 = { description = "KDE Workspace"; longDescription = "KDE base components that are only required to work with X11 such KDM and KWin"; diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 9623f309fc9..868887b3123 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -69,7 +69,7 @@ pkgs.recurseIntoAttrs (rec { ### BASE kdebase_workspace = import ./base-workspace { 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 kdelibs kdepimlibs kdebindings; inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt;