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

KDE: PIM: make it actually work if you install it, without having to hunt for missing dependencies

Browse Source 
svn path=/nixpkgs/trunk/; revision=23903
This commit is contained in:
Evgeny Egorochkin
2010-09-22 22:55:42 +00:00
parent 716fa88212
commit 80aed14c87
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/kde-4.4/default.nix
+1 -1
View File
@@ -157,7 +157,7 @@ pkgs.recurseIntoAttrs (rec {
inherit (pkgs) stdenv fetchurl lib 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) shared_mime_info;
inherit (pkgs.xlibs) libXScrnSaver; inherit (pkgs.xlibs) libXScrnSaver;
inherit kdelibs kdepimlibs; inherit kdelibs kdepimlibs kdepim_runtime;
inherit automoc4 phonon akonadi strigi soprano qca2; inherit automoc4 phonon akonadi strigi soprano qca2;
}; };
pkgs/desktops/kde-4.4/pim/default.nix
+3 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, boost, gpgme, libassuan, libgpgerror, libxslt { stdenv, fetchurl, lib, cmake, qt4, perl, boost, gpgme, libassuan, libgpgerror, libxslt
, shared_mime_info, libXScrnSaver , shared_mime_info, libXScrnSaver
, kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}: , kdelibs, kdepimlibs, kdepim_runtime, automoc4, phonon, akonadi, strigi, soprano, qca2}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdepim-4.4.5"; name = "kdepim-4.4.5";
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
cmakeFlags = "-DBUILD_kleopatra=OFF"; # doesn't build with new boost cmakeFlags = "-DBUILD_kleopatra=OFF"; # doesn't build with new boost
buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
shared_mime_info libXScrnSaver shared_mime_info libXScrnSaver
kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ]; kdelibs automoc4 phonon akonadi strigi soprano qca2 ];
propagatedBuildInputs = [ kdepimlibs kdepim_runtime ];
meta = { meta = {
description = "KDE PIM tools"; description = "KDE PIM tools";
longDescription = '' longDescription = ''