forked from mirrors/nixpkgs
Upgraded KDE network, pim to 4.3.1
svn path=/nixpkgs/trunk/; revision=17014
This commit is contained in:
parent
33d7ae6288
commit
82ce10a720
|
@ -128,18 +128,18 @@ rec {
|
|||
};
|
||||
|
||||
kdenetwork = import ./network {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib;
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib;
|
||||
inherit (pkgs) libidn libvncserver tapioca_qt libmsn;
|
||||
inherit (pkgs.xlibs) libXtst libXdamage libXxf86vm;
|
||||
inherit kdelibs kdepimlibs;
|
||||
inherit automoc4 phonon qca2 soprano qimageblitz;
|
||||
inherit automoc4 phonon qca2 soprano qimageblitz strigi;
|
||||
};
|
||||
|
||||
kdepim = import ./pim {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl boost gpgme libassuan libgpgerror libxslt;
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl boost gpgme libassuan libgpgerror libxslt;
|
||||
inherit (pkgs) shared_mime_info;
|
||||
inherit (pkgs.xlibs) libXScrnSaver;
|
||||
inherit kdelibs kdepimlibs;
|
||||
inherit kdelibs kdelibs_experimental kdepimlibs;
|
||||
inherit automoc4 phonon akonadi strigi soprano qca2;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,18 +1,25 @@
|
|||
{stdenv, fetchurl, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn,
|
||||
libvncserver, tapioca_qt, libmsn,
|
||||
libXtst, libXdamage, libXxf86vm,
|
||||
kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz}:
|
||||
{ stdenv, fetchurl, lib, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
|
||||
, libvncserver, tapioca_qt, libmsn
|
||||
, libXtst, libXdamage, libXxf86vm
|
||||
, kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdenetwork-4.2.4";
|
||||
name = "kdenetwork-4.3.1";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.2.4/src/kdenetwork-4.2.4.tar.bz2;
|
||||
sha1 = "31f3f1c44690339ce523c309a3d2c131563d9f97";
|
||||
url = mirror://kde/stable/4.3.1/src/kdenetwork-4.3.1.tar.bz2;
|
||||
sha1 = "57194b5f89b37329e562951c491fa18029c0b431";
|
||||
};
|
||||
includeAllQtDirs=true;
|
||||
CMAKE_PREFIX_PATH=kdepimlibs;
|
||||
buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
|
||||
libvncserver tapioca_qt libmsn
|
||||
libXtst libXdamage libXxf86vm
|
||||
kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz ];
|
||||
kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ];
|
||||
meta = {
|
||||
description = "KDE network utilities";
|
||||
longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface";
|
||||
license = "GPL";
|
||||
homepage = http://www.kde.org;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,17 +1,26 @@
|
|||
{stdenv, fetchurl, cmake, qt4, perl, boost, gpgme, libassuan, libgpgerror, libxslt,
|
||||
shared_mime_info, libXScrnSaver,
|
||||
kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}:
|
||||
{ stdenv, fetchurl, lib, cmake, qt4, perl, boost, gpgme, libassuan, libgpgerror, libxslt
|
||||
, shared_mime_info, libXScrnSaver
|
||||
, kdelibs, kdelibs_experimental, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdepim-4.2.4";
|
||||
name = "kdepim-4.3.1";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/4.2.4/src/kdepim-4.2.4.tar.bz2;
|
||||
sha1 = "d2328af104edf6471e3474ccea39710e0e1babc9";
|
||||
url = mirror://kde/stable/4.3.1/src/kdepim-4.3.1.tar.bz2;
|
||||
sha1 = "6fd0309dbd911e2667ec1c08d1f10f2626a54534";
|
||||
};
|
||||
includeAllQtDirs=true;
|
||||
CMAKE_PREFIX_PATH=kdepimlibs;
|
||||
builder = ./builder.sh;
|
||||
buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
|
||||
shared_mime_info libXScrnSaver
|
||||
kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ];
|
||||
kdelibs kdelibs_experimental kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ];
|
||||
meta = {
|
||||
description = "KDE PIM tools";
|
||||
longDescription = ''
|
||||
Contains various personal information management tools for KDE, such as an organizer
|
||||
'';
|
||||
license = "GPL";
|
||||
homepage = http://www.kde.org;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue