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

Patches the python modules path of kdebase-workspace to compile with kdebindings again 

svn path=/nixpkgs/trunk/; revision=19992
This commit is contained in:
Sander van der Burg 2010-02-14 21:19:45 +00:00
parent 1d2c0eea75
commit 6eb2cc674a
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/kde-4.4/base-workspace/builder.sh Normal file
View File

@ -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

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

@ -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 , 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
@ -11,9 +11,10 @@ stdenv.mkDerivation {
url = mirror://kde/stable/4.4.0/src/kdebase-workspace-4.4.0.tar.bz2; url = mirror://kde/stable/4.4.0/src/kdebase-workspace-4.4.0.tar.bz2;
sha256 = "16rc4cpq97bfcvj0bmq9k3kv48gjbx8569m7lg3qm91xg8nz79hn"; 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 libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver
lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ]; lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ];
builder = ./builder.sh;
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";

2
pkgs/desktops/kde-4.4/default.nix
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;
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;