diff --git a/pkgs/desktops/kde-4.3/base-runtime/default.nix b/pkgs/desktops/kde-4.3/base-runtime/default.nix index 3c0200f2168..8fde75ead27 100644 --- a/pkgs/desktops/kde-4.3/base-runtime/default.nix +++ b/pkgs/desktops/kde-4.3/base-runtime/default.nix @@ -1,14 +1,21 @@ -{stdenv, fetchurl, cmake, perl, bzip2, qt4, alsaLib, xineLib, samba, kdelibs, - automoc4, phonon, strigi, soprano, cluceneCore}: +{ stdenv, fetchurl, lib, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba, shared_mime_info +, kdelibs, automoc4, phonon, strigi, soprano, cluceneCore}: stdenv.mkDerivation { - name = "kdebase-runtime-4.2.4"; + name = "kdebase-runtime-4.3.1"; src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdebase-runtime-4.2.4.tar.bz2; - sha1 = "dd829270b5fb21e4c24db5e7d16db6e99fe51c1d"; + url = mirror://kde/stable/4.3.1/src/kdebase-runtime-4.3.1.tar.bz2; + sha1 = "4cb7a4ed093bacf01d5ecff1cbc60a8934dea59c"; }; /* CLUCENE_HOME=cluceneCore;*/ includeAllQtDirs=true; - buildInputs = [ cmake perl bzip2 qt4 alsaLib xineLib samba stdenv.gcc.libc kdelibs - automoc4 phonon strigi soprano cluceneCore ]; + buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba stdenv.gcc.libc shared_mime_info + kdelibs automoc4 phonon strigi soprano cluceneCore ]; + meta = { + description = "KDE runtime"; + longDescription = "Libraries and tools which supports running KDE desktop applications"; + license = "LGPL"; + homepage = http://www.kde.org; + maintainers = [ lib.maintainers.sander ]; + }; } diff --git a/pkgs/desktops/kde-4.3/base-workspace/builder.sh b/pkgs/desktops/kde-4.3/base-workspace/builder.sh new file mode 100644 index 00000000000..97aba633c56 --- /dev/null +++ b/pkgs/desktops/kde-4.3/base-workspace/builder.sh @@ -0,0 +1,11 @@ +source $stdenv/setup + +myPatchPhase() +{ + for i in plasma/applets/systemtray/CMakeLists.txt plasma/applets/systemtray/notificationitemwatcher/CMakeLists.txt + do + sed -i -e "s|\${KDE4_DBUS_INTERFACES_DIR}|$kdelibs_experimental/share/dbus-1|" $i + done +} +patchPhase=myPatchPhase +genericBuild diff --git a/pkgs/desktops/kde-4.3/base-workspace/default.nix b/pkgs/desktops/kde-4.3/base-workspace/default.nix index 19fd20823f1..464e72cf1df 100644 --- a/pkgs/desktops/kde-4.3/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.3/base-workspace/default.nix @@ -1,18 +1,27 @@ -{stdenv, fetchurl, cmake, perl, python, pam, ConsoleKit, - qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings, - libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver, - lm_sensors, libxklavier, libusb, pthread_stubs, boost, - automoc4, phonon, strigi, soprano, qimageblitz}: +{ stdenv, fetchurl, lib, cmake, perl, python, pam, ConsoleKit +, qt4, sip, pyqt4, kdelibs, kdelibs_experimental, kdepimlibs, kdebindings +, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver +, lm_sensors, libxklavier, libusb, pthread_stubs, boost +, automoc4, phonon, strigi, soprano, qimageblitz, akonadi +}: stdenv.mkDerivation { - name = "kdebase-workspace-4.2.4"; + name = "kdebase-workspace-4.3.1"; src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdebase-workspace-4.2.4.tar.bz2; - sha1 = "31f38436736ff73b6ffb9d8bbb93b8342965e894"; + url = mirror://kde/stable/4.3.1/src/kdebase-workspace-4.3.1.tar.bz2; + sha1 = "c21a6e8028aa993878cccccb26b2611b3337eac9"; }; includeAllQtDirs=true; CMAKE_PREFIX_PATH=kdepimlibs; - buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc + inherit kdelibs_experimental; + builder = ./builder.sh; + buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdelibs_experimental kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver - lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz ]; + lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi ]; + meta = { + description = "KDE Workspace"; + longDescription = "KDE base components that are only required to work with X11 such KDM and KWin"; + license = "GPL"; + maintainers = [ lib.maintainers.sander ]; + }; } diff --git a/pkgs/desktops/kde-4.3/base/default.nix b/pkgs/desktops/kde-4.3/base/default.nix index b608667e06d..ef201faec45 100644 --- a/pkgs/desktops/kde-4.3/base/default.nix +++ b/pkgs/desktops/kde-4.3/base/default.nix @@ -1,13 +1,21 @@ -{stdenv, fetchurl, cmake, perl, qt4, kdelibs, pciutils, libraw1394, - automoc4, phonon, strigi, qimageblitz, soprano}: +{ stdenv, fetchurl, lib, cmake, perl, qt4, kdelibs, pciutils, libraw1394 +, kdebase_workspace +, automoc4, phonon, strigi, qimageblitz, soprano}: stdenv.mkDerivation { - name = "kdebase-4.2.4"; + name = "kdebase-4.3.1"; src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdebase-4.2.4.tar.bz2; - sha1 = "c08188baa90a5075f18a75640c4dc3e6dc69daa0"; + url = mirror://kde/stable/4.3.1/src/kdebase-4.3.1.tar.bz2; + sha1 = "005681277615a0a3ec737bdd07989763fa1ae781"; }; includeAllQtDirs=true; buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394 - automoc4 phonon strigi qimageblitz soprano ]; + kdebase_workspace automoc4 phonon strigi qimageblitz soprano ]; + meta = { + description = "KDE Base components"; + longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole"; + license = "GPL"; + homepage = http://www.kde.org; + maintainers = [ lib.maintainers.sander ]; + }; } diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index aab3524fbee..37a5887a90f 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -47,29 +47,34 @@ rec { ### LIBS kdelibs = import ./libs { - inherit (pkgs) stdenv fetchurl cmake qt4 perl bzip2 pcre fam libxml2 libxslt; - inherit (pkgs) giflib jasper openexr aspell avahi shared_mime_info; + 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; inherit automoc4 phonon strigi soprano; }; + kdelibs_experimental = import ./libs-experimental { + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; + inherit automoc4 kdelibs phonon; + }; + ### BASE kdebase_workspace = import ./base-workspace { - inherit (pkgs) stdenv fetchurl 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 pthread_stubs boost ConsoleKit; inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver; - inherit kdelibs kdepimlibs kdebindings; - inherit automoc4 phonon strigi soprano qimageblitz; + inherit kdelibs kdelibs_experimental kdepimlibs kdebindings; + inherit automoc4 phonon strigi soprano qimageblitz akonadi; }; kdebase = import ./base { - inherit (pkgs) stdenv fetchurl cmake perl qt4 pciutils libraw1394; - inherit kdelibs; + inherit (pkgs) stdenv fetchurl lib cmake perl qt4 pciutils libraw1394; + inherit kdelibs kdebase_workspace; inherit automoc4 phonon strigi qimageblitz soprano; }; kdebase_runtime = import ./base-runtime { - inherit (pkgs) stdenv fetchurl cmake perl bzip2 qt4; - inherit (pkgs) xineLib alsaLib samba cluceneCore; + inherit (pkgs) stdenv fetchurl cmake lib perl bzip2 xz qt4; + inherit (pkgs) shared_mime_info xineLib alsaLib samba cluceneCore; inherit kdelibs; inherit automoc4 phonon strigi soprano; }; @@ -77,7 +82,8 @@ rec { ### ADDITIONAL kdepimlibs = import ./pimlibs { - inherit (pkgs) stdenv fetchurl cmake qt4 perl boost cyrus_sasl gpgme libical openldap; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl boost cyrus_sasl gpgme; + inherit (pkgs) libical openldap shared_mime_info; inherit kdelibs; inherit automoc4 phonon akonadi; }; diff --git a/pkgs/desktops/kde-4.3/libs-experimental/builder.sh b/pkgs/desktops/kde-4.3/libs-experimental/builder.sh new file mode 100644 index 00000000000..a96733cde78 --- /dev/null +++ b/pkgs/desktops/kde-4.3/libs-experimental/builder.sh @@ -0,0 +1,8 @@ +source $stdenv/setup + +myPatchPhase() +{ + sed -i -e "s|\${KDE4_DBUS_INTERFACES_DIR}|$out/share/dbus-1|" knotificationitem/CMakeLists.txt +} +patchPhase=myPatchPhase +genericBuild diff --git a/pkgs/desktops/kde-4.3/libs-experimental/default.nix b/pkgs/desktops/kde-4.3/libs-experimental/default.nix new file mode 100644 index 00000000000..2d02a197db0 --- /dev/null +++ b/pkgs/desktops/kde-4.3/libs-experimental/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, lib, cmake, qt4, perl, automoc4, kdelibs, phonon}: + +stdenv.mkDerivation { + name = "kdelibs-experimental-4.3.1"; + src = fetchurl { + url = mirror://kde/stable/4.3.1/src/kdelibs-experimental-4.3.1.tar.bz2; + sha1 = "7d560817a186c4b7099d321ee4a58705962a59d3"; + }; + 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 ]; + }; +} diff --git a/pkgs/desktops/kde-4.3/libs/default.nix b/pkgs/desktops/kde-4.3/libs/default.nix index 1837f3a32cd..49b9e43a9e8 100644 --- a/pkgs/desktops/kde-4.3/libs/default.nix +++ b/pkgs/desktops/kde-4.3/libs/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, cmake, perl +{ stdenv, fetchurl, cmake, lib, perl , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper -, openexr, aspell, avahi +, xz, flex, bison, openexr, aspell, avahi , automoc4, phonon, strigi, soprano }: stdenv.mkDerivation { - name = "kdelibs-4.2.4"; + name = "kdelibs-4.3.1"; src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdelibs-4.2.4.tar.bz2; - sha1 = "259947ede89daec94475a811a41ae7474bc4fd17"; + url = mirror://kde/stable/4.3.1/src/kdelibs-4.3.1.tar.bz2; + sha1 = "511532852caca9302c643fded4013ef1f57d5433"; }; includeAllQtDirs = true; buildInputs = [ - cmake perl qt4 stdenv.gcc.libc bzip2 pcre fam libxml2 libxslt + cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info giflib jasper /* openexr */ aspell avahi automoc4 phonon strigi soprano ]; + + meta = { + description = "KDE libraries"; + license = "LGPL"; + homepage = http://www.kde.org; + maintainers = [ lib.maintainers.sander ]; + }; } diff --git a/pkgs/desktops/kde-4.3/pimlibs/default.nix b/pkgs/desktops/kde-4.3/pimlibs/default.nix index 38c72a18d0f..2960169bb05 100644 --- a/pkgs/desktops/kde-4.3/pimlibs/default.nix +++ b/pkgs/desktops/kde-4.3/pimlibs/default.nix @@ -1,13 +1,19 @@ -{stdenv, fetchurl, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, - kdelibs, automoc4, phonon, akonadi}: +{ stdenv, fetchurl, lib, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info +, kdelibs, automoc4, phonon, akonadi}: stdenv.mkDerivation { - name = "kdepimlibs-4.2.4"; + name = "kdepimlibs-4.3.1"; src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdepimlibs-4.2.4.tar.bz2; - sha1 = "1deb9298fe935ed1a53fad8e2a060fdc1c3e4ad8"; + url = mirror://kde/stable/4.3.1/src/kdepimlibs-4.3.1.tar.bz2; + sha1 = "f4b04b21a6aa3accc530bc6c32cf0d820c611265"; }; includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap + buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap shared_mime_info kdelibs automoc4 phonon akonadi ]; + meta = { + description = "KDE PIM libraries"; + license = "LGPL"; + homepage = http://www.kde.org; + maintainers = [ lib.maintainers.sander ]; + }; }