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

Some fixes to kdebindings. I now builds again but still gives me a compile error

Browse Source 
svn path=/nixpkgs/trunk/; revision=19973
This commit is contained in:
Sander van der Burg 2010-02-13 14:02:07 +00:00
parent f1f60cef0d
commit e4b1633d6b
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/desktops/kde-4.4/bindings/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, lib, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4
, libSM, libXrender, libXrandr, libXfixes, libXinerama, libXcursor, libXext, kdelibs}:
{ stdenv, fetchurl, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost
, kdelibs, kdepimlibs, automoc4, phonon, soprano, akonadi, qimageblitz, attica, polkit_qt
}:
# This function will only build the pykde4 module. I don't need the other bindings and
# some bindings are even broken.
@ -10,9 +11,14 @@ stdenv.mkDerivation {
url = mirror://kde/stable/4.4.0/src/kdebindings-4.4.0.tar.bz2;
sha256 = "1yn0wynnigbp288j9pqfd5cppc6mja9z9pcfz7g789pmyig42jvd";
};
builder = ./builder.sh;
buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4
libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext kdelibs ];
#builder = ./builder.sh;
# Disable smoke because I don't need it and gives us an error
cmakeFlags = [ "-DENABLE_SMOKE=OFF" ];
# Okular seems also an optional depenedency which I left out
buildInputs = [ cmake perl python sip pyqt4 zlib libpng freetype fontconfig qt4 boost
kdelibs kdepimlibs automoc4 phonon soprano akonadi qimageblitz attica polkit_qt ];
meta = {
description = "KDE bindings";
longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";

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

@ -195,9 +195,8 @@ pkgs.recurseIntoAttrs (rec {
### DEVELOPMENT
kdebindings = import ./bindings {
inherit (pkgs) stdenv fetchurl lib python sip zlib libpng pyqt4 freetype fontconfig qt4;
inherit (pkgs.xlibs) libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext;
inherit kdelibs;
inherit (pkgs) stdenv fetchurl cmake perl lib python sip zlib libpng pyqt4 freetype fontconfig qt4 boost;
inherit kdelibs kdepimlibs automoc4 phonon soprano akonadi qimageblitz attica polkit_qt;
};
kdesdk = import ./sdk {