ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Implemented fixes to the KDE 4.2 network and pim packages

Browse Source 
svn path=/nixpkgs/trunk/; revision=14211
This commit is contained in:
Sander van der Burg 2009-02-23 22:26:58 +00:00
parent 160b00c8b4
commit 9b24c0a5e8
5 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/desktops/kde-4.2/default.nix
View File

@ -38,7 +38,7 @@ rec {
}; };
decibel = import ./support/decibel { 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 { eigen = import ./support/eigen {
@ -119,16 +119,18 @@ rec {
kdenetwork = import ./network { kdenetwork = import ./network {
inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib; inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib;
inherit (pkgs) libidn libvncserver; inherit (pkgs) libidn libvncserver tapioca_qt libmsn;
inherit (pkgs.xlibs) libXtst; inherit (pkgs.xlibs) libXtst libXdamage;
inherit kdelibs kdepimlibs; inherit kdelibs kdepimlibs;
inherit automoc4 phonon qca2 soprano qimageblitz decibel; inherit automoc4 phonon qca2 soprano qimageblitz;
}; };
kdepim = import ./pim { 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 kdelibs kdepimlibs;
inherit automoc4 phonon akonadi strigi soprano; inherit automoc4 phonon akonadi strigi soprano qca2;
}; };
kdegames = import ./games { kdegames = import ./games {

12
pkgs/desktops/kde-4.2/network/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn, {stdenv, fetchurl, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn,
libvncserver, libvncserver, tapioca_qt, libmsn,
libXtst, libXtst, libXdamage,
kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, decibel}: kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdenetwork-4.2.0"; name = "kdenetwork-4.2.0";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
}; };
CMAKE_PREFIX_PATH=kdepimlibs; CMAKE_PREFIX_PATH=kdepimlibs;
buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
libvncserver libvncserver tapioca_qt libmsn
libXtst libXtst libXdamage
kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz decibel ]; kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz ];
} }

8
pkgs/desktops/kde-4.2/pim/builder.sh Normal file
View 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

11
pkgs/desktops/kde-4.2/pim/default.nix
View File

@ -1,5 +1,6 @@
{stdenv, fetchurl, cmake, qt4, perl, boost, gpgme, libassuan, libgpgerror, {stdenv, fetchurl, cmake, qt4, perl, boost, gpgme, libassuan, libgpgerror, libxslt,
kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano}: shared_mime_info, libXScrnSaver,
kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdepim-4.2.0"; name = "kdepim-4.2.0";
@ -8,6 +9,8 @@ stdenv.mkDerivation {
md5 = "a80631de21930b2544c86722138aaa6c"; md5 = "a80631de21930b2544c86722138aaa6c";
}; };
CMAKE_PREFIX_PATH=kdepimlibs; CMAKE_PREFIX_PATH=kdepimlibs;
buildInputs = [ cmake qt4 perl boost gpgme libassuan libgpgerror builder = ./builder.sh;
kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano ]; buildInputs = [ cmake qt4 perl boost gpgme libassuan libgpgerror libxslt
shared_mime_info libXScrnSaver
kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ];
} }

4
pkgs/desktops/kde-4.2/support/decibel/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, qt4, tapioca_qt}: {stdenv, fetchurl, cmake, qt4, tapioca_qt, telepathy_qt}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "decibel-0.5.0"; 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; url = http://decibel.kde.org/fileadmin/downloads/decibel/releases/decibel-0.5.0.tar.gz;
md5 = "7de299ace568c87a746388ad765228e5"; md5 = "7de299ace568c87a746388ad765228e5";
}; };
buildInputs = [ cmake qt4 tapioca_qt ]; buildInputs = [ cmake qt4 tapioca_qt telepathy_qt ];
} }