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

- Completed all dependencies for kdelibs-4.4.0

Browse Source 
- Added SIP 4.10 required for pyqt-4.7.x
- Removed kde libs experimental, which does not exists anymore in 4.4.0


svn path=/nixpkgs/trunk/; revision=19910
This commit is contained in:
Sander van der Burg 2010-02-10 16:01:55 +00:00
parent 41687e464e
commit 31cbd149d2
8 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/data/misc/shared-desktop-ontologies/default.nix Normal file
View File

@ -0,0 +1,14 @@
{stdenv, fetchurl, cmake}:
stdenv.mkDerivation {
name = "shared-desktop-ontologies-0.2";
src = fetchurl {
url = mirror://sourceforge/shared-desktop-ontologies/shared-desktop-ontologies-0.2.tar.bz2;
sha256 = "1w9gfprrp518hb7nm5wspxjd7xx0h08bph6asrx5vrx7j7fzg4m7";
};
buildInputs = [ cmake ];
meta = {
description = "Ontologies necessary for the Nepomuk semantic desktop";
maintainers = [ stdenv.lib.maintainers.sander ];
};
}

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

@ -5,10 +5,10 @@
# some bindings are even broken.
stdenv.mkDerivation {
name = "kdebindings-4.3.4";
name = "kdebindings-4.4.0";
src = fetchurl {
url = mirror://kde/stable/4.3.4/src/kdebindings-4.3.4.tar.bz2;
sha1 = "0c7bf45bd3d81bf6aa1d2b085c17b4ce925c656b";
url = mirror://kde/stable/4.4.0/src/kdebindings-4.4.0.tar.bz2;
sha1 = "1yn0wynnigbp288j9pqfd5cppc6mja9z9pcfz7g789pmyig42jvd";
};
builder = ./builder.sh;
includeAllQtDirs=true;

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

@ -61,15 +61,12 @@ pkgs.recurseIntoAttrs (rec {
kdelibs = import ./libs {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info
kerberos acl attr;
kerberos acl attr shared_desktop_ontologies;
inherit (pkgs.xlibs) libXScrnSaver;
inherit automoc4 phonon strigi soprano qca2 attica;
inherit automoc4 phonon strigi soprano qca2 attica polkit_qt;
};
kdelibs_experimental = import ./libs-experimental {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl;
inherit automoc4 kdelibs phonon;
};
kdelibs_experimental = null;
### BASE
kdebase_workspace = import ./base-workspace {

8
pkgs/desktops/kde-4.4/libs-experimental/builder.sh
View File

@ -1,8 +0,0 @@
source $stdenv/setup
myPatchPhase()
{
sed -i -e "s|\${KDE4_DBUS_INTERFACES_DIR}|$out/share/dbus-1|" knotificationitem/CMakeLists.txt
}
patchPhase=myPatchPhase
genericBuild

18
pkgs/desktops/kde-4.4/libs-experimental/default.nix
View File

@ -1,18 +0,0 @@
{stdenv, fetchurl, lib, cmake, qt4, perl, automoc4, kdelibs, phonon}:
stdenv.mkDerivation {
name = "kdelibs-experimental-4.3.4";
src = fetchurl {
url = mirror://kde/stable/4.3.4/src/kdelibs-experimental-4.3.4.tar.bz2;
sha1 = "43e19c44c3cdc1049c9ee9aca2e2f83a48ffe8bd";
};
builder = ./builder.sh;
buildInputs = [ cmake qt4 perl automoc4 kdelibs phonon ];
includeAllQtDirs=true;
meta = {
description = "KDE experimental library";
license = "LGPL";
homepage = http://www.kde.org;
maintainers = [ lib.maintainers.sander ];
};
}

10
pkgs/desktops/kde-4.4/libs/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, lib, perl
, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, libXScrnSaver
, automoc4, phonon, strigi, soprano, qca2, attica
, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
, automoc4, phonon, strigi, soprano, qca2, attica, polkit_qt
}:
stdenv.mkDerivation {
@ -17,10 +17,12 @@ stdenv.mkDerivation {
buildInputs = [
cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt
shared_mime_info giflib jasper openexr aspell avahi kerberos acl attr
libXScrnSaver
automoc4 phonon strigi soprano qca2 attica
shared_desktop_ontologies libXScrnSaver
automoc4 phonon strigi soprano qca2 attica polkit_qt
];
CMAKE_PREFIX_PATH=shared_desktop_ontologies;
# I don't know why cmake does not find the acl files (but finds attr files)
cmakeFlags = [ "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON" ];

16
pkgs/development/python-modules/python-sip/4.10.nix Normal file
View File

@ -0,0 +1,16 @@
{stdenv, fetchurl, lib, python}:
stdenv.mkDerivation {
name = "sip-4.10";
src = fetchurl {
url = http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-4.10.tar.gz;
sha256 = "15nnwn0x92iz5vh5d16dlqvxl56i8y4n4va53gc3f7z4d557d2nh";
};
configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";
buildInputs = [ python ];
meta = {
description = "Creates C++ bindings for Python modules";
license = "GPL";
maintainers = [ lib.maintainers.sander ];
};
}

8
pkgs/top-level/all-packages.nix
View File

@ -5291,6 +5291,10 @@ let
inherit stdenv fetchurl lib python;
};
sip410 = import ../development/python-modules/python-sip/4.10.nix {
inherit stdenv fetchurl lib python;
};
sip_python26 = import ../development/python-modules/python-sip {
inherit stdenv fetchurl lib;
python = python26;
@ -6521,6 +6525,10 @@ let
inherit fetchurl stdenv pkgconfig gettext
intltool perl perlXMLParser libxml2 glib;
};
shared_desktop_ontologies = import ../data/misc/shared-desktop-ontologies {
inherit stdenv fetchurl cmake;
};
stdmanpages = import ../data/documentation/std-man-pages {
inherit fetchurl stdenv;