mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 04:12:44 +03:00
Implemented fixes to the KDE 4.2 network and pim packages
svn path=/nixpkgs/trunk/; revision=14211
This commit is contained in:
parent
160b00c8b4
commit
9b24c0a5e8
@ -38,11 +38,11 @@ rec {
|
||||
};
|
||||
|
||||
decibel = import ./support/decibel {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 tapioca_qt;
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 tapioca_qt telepathy_qt dbus;
|
||||
};
|
||||
|
||||
eigen = import ./support/eigen {
|
||||
inherit (pkgs) stdenv fetchurl cmake;
|
||||
inherit (pkgs) stdenv fetchurl cmake;
|
||||
};
|
||||
|
||||
### LIBS
|
||||
@ -119,16 +119,18 @@ rec {
|
||||
|
||||
kdenetwork = import ./network {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib;
|
||||
inherit (pkgs) libidn libvncserver;
|
||||
inherit (pkgs.xlibs) libXtst;
|
||||
inherit (pkgs) libidn libvncserver tapioca_qt libmsn;
|
||||
inherit (pkgs.xlibs) libXtst libXdamage;
|
||||
inherit kdelibs kdepimlibs;
|
||||
inherit automoc4 phonon qca2 soprano qimageblitz decibel;
|
||||
inherit automoc4 phonon qca2 soprano qimageblitz;
|
||||
};
|
||||
|
||||
kdepim = import ./pim {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl boost gpgme libassuan libgpgerror;
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl boost gpgme libassuan libgpgerror libxslt;
|
||||
inherit (pkgs) shared_mime_info;
|
||||
inherit (pkgs.xlibs) libXScrnSaver;
|
||||
inherit kdelibs kdepimlibs;
|
||||
inherit automoc4 phonon akonadi strigi soprano;
|
||||
inherit automoc4 phonon akonadi strigi soprano qca2;
|
||||
};
|
||||
|
||||
kdegames = import ./games {
|
||||
|
@ -1,7 +1,7 @@
|
||||
{stdenv, fetchurl, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn,
|
||||
libvncserver,
|
||||
libXtst,
|
||||
kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, decibel}:
|
||||
libvncserver, tapioca_qt, libmsn,
|
||||
libXtst, libXdamage,
|
||||
kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdenetwork-4.2.0";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
CMAKE_PREFIX_PATH=kdepimlibs;
|
||||
buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
|
||||
libvncserver
|
||||
libXtst
|
||||
kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz decibel ];
|
||||
libvncserver tapioca_qt libmsn
|
||||
libXtst libXdamage
|
||||
kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz ];
|
||||
}
|
||||
|
8
pkgs/desktops/kde-4.2/pim/builder.sh
Normal file
8
pkgs/desktops/kde-4.2/pim/builder.sh
Normal file
@ -0,0 +1,8 @@
|
||||
source $stdenv/setup
|
||||
|
||||
myPatchPhase()
|
||||
{
|
||||
find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
|
||||
}
|
||||
patchPhase=myPatchPhase
|
||||
genericBuild
|
@ -1,5 +1,6 @@
|
||||
{stdenv, fetchurl, cmake, qt4, perl, boost, gpgme, libassuan, libgpgerror,
|
||||
kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano}:
|
||||
{stdenv, fetchurl, cmake, qt4, perl, boost, gpgme, libassuan, libgpgerror, libxslt,
|
||||
shared_mime_info, libXScrnSaver,
|
||||
kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "kdepim-4.2.0";
|
||||
@ -8,6 +9,8 @@ stdenv.mkDerivation {
|
||||
md5 = "a80631de21930b2544c86722138aaa6c";
|
||||
};
|
||||
CMAKE_PREFIX_PATH=kdepimlibs;
|
||||
buildInputs = [ cmake qt4 perl boost gpgme libassuan libgpgerror
|
||||
kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano ];
|
||||
builder = ./builder.sh;
|
||||
buildInputs = [ cmake qt4 perl boost gpgme libassuan libgpgerror libxslt
|
||||
shared_mime_info libXScrnSaver
|
||||
kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ];
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, cmake, qt4, tapioca_qt}:
|
||||
{stdenv, fetchurl, cmake, qt4, tapioca_qt, telepathy_qt}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "decibel-0.5.0";
|
||||
@ -6,5 +6,5 @@ stdenv.mkDerivation {
|
||||
url = http://decibel.kde.org/fileadmin/downloads/decibel/releases/decibel-0.5.0.tar.gz;
|
||||
md5 = "7de299ace568c87a746388ad765228e5";
|
||||
};
|
||||
buildInputs = [ cmake qt4 tapioca_qt ];
|
||||
buildInputs = [ cmake qt4 tapioca_qt telepathy_qt ];
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user