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

kdepimlibs: Get rid of a dependency on boost.dev

Browse Source
This commit is contained in:
Eelco Dolstra 2014-12-15 17:51:38 +01:00
parent 9bf16a9c33
commit 0e8373143e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/kde-4.14/kdelibs/baloo.nix
View File

@ -1,4 +1,4 @@
{ stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata { stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata, boost
}: }:
kde { kde {
@ -6,7 +6,7 @@ kde {
# TODO: qmobipocket # TODO: qmobipocket
buildInputs = [ buildInputs = [
kdelibs kdepimlibs xapian qjson akonadi kfilemetadata kdelibs kdepimlibs xapian qjson akonadi kfilemetadata boost
]; ];
nativeBuildInputs = [ pkgconfig doxygen ]; nativeBuildInputs = [ pkgconfig doxygen ];

7
pkgs/desktops/kde-4.14/kdepimlibs.nix
View File

@ -6,11 +6,14 @@ kde {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = buildInputs =
[ gpgme libical libxslt qjson prison [ boost gpgme libical libxslt qjson prison
openldap cyrus_sasl akonadi shared_desktop_ontologies openldap cyrus_sasl akonadi shared_desktop_ontologies
]; ];
propagatedBuildInputs = [ kdelibs nepomuk_core boost ]; propagatedBuildInputs = [ kdelibs nepomuk_core ];
# Prevent a dependency on boost.dev. FIXME: move this cmake file to .dev.
postInstall = "rm $out/lib/gpgmepp/GpgmeppConfig.cmake";
meta = { meta = {
description = "KDE PIM libraries"; description = "KDE PIM libraries";