diff --git a/pkgs/desktops/kde-4.4/base-workspace/builder.sh b/pkgs/desktops/kde-4.4/base-workspace/builder.sh new file mode 100644 index 00000000000..ace6677be52 --- /dev/null +++ b/pkgs/desktops/kde-4.4/base-workspace/builder.sh @@ -0,0 +1,8 @@ +source $stdenv/setup + +myPatchPhase() +{ + sed -i -e "s|\${PYTHON_SITE_PACKAGES_DIR}|$out/lib/python2.6/site-packages|" plasma/generic/scriptengines/python/CMakeLists.txt +} +patchPhase=myPatchPhase +genericBuild diff --git a/pkgs/desktops/kde-4.4/base-workspace/default.nix b/pkgs/desktops/kde-4.4/base-workspace/default.nix index 3cf2b25a308..86fd8d09746 100644 --- a/pkgs/desktops/kde-4.4/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.4/base-workspace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, cmake, perl, python, pam, ConsoleKit +{ stdenv, fetchurl, lib, cmake, perl, python, pam, consolekit , qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver , lm_sensors, libxklavier, libusb, libpthreadstubs, boost @@ -11,9 +11,10 @@ stdenv.mkDerivation { url = mirror://kde/stable/4.4.0/src/kdebase-workspace-4.4.0.tar.bz2; sha256 = "16rc4cpq97bfcvj0bmq9k3kv48gjbx8569m7lg3qm91xg8nz79hn"; }; - 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 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; 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 2d1dc436941..3d513f770bf 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; inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs; inherit kdelibs kdepimlibs kdebindings; inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt;