kde-4.14: Make it all build.

This commit is contained in:
ambrop7@gmail.com 2014-09-21 22:49:35 +02:00
parent f6fd3b7754
commit 0e8e45f3ab
8 changed files with 15 additions and 15 deletions

View file

@ -1,9 +1,9 @@
{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro, pkgconfig }: { kde, kdelibs, facile, ocaml, eigen2, eigen, openbabel, avogadro, pkgconfig }:
kde { kde {
# TODO: chemical mime data # TODO: chemical mime data
buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ]; buildInputs = [ kdelibs facile ocaml eigen2 eigen openbabel avogadro ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View file

@ -1,10 +1,10 @@
{ kde, kdelibs, eigen, xplanet, indilib, pkgconfig }: { kde, kdelibs, eigen, xplanet, indilib_0_9_9, pkgconfig, qjson }:
kde { kde {
# TODO: wcslib, astrometry # TODO: wcslib, astrometry
buildInputs = [ kdelibs eigen xplanet indilib ]; buildInputs = [ kdelibs eigen xplanet indilib_0_9_9 qjson ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View file

@ -1,8 +1,8 @@
{ kde, kdelibs, gsl, libqalculate, eigen, pkgconfig }: { kde, kdelibs, gsl, libqalculate, eigen2, pkgconfig }:
kde { kde {
buildInputs = [ kdelibs gsl libqalculate eigen ]; buildInputs = [ kdelibs gsl libqalculate eigen2 ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View file

@ -1,10 +1,11 @@
{ stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core { stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core
, libjpeg, pkgconfig, kactivities, lcms2 }: , libjpeg, pkgconfig, kactivities, lcms2, baloo, kfilemetadata, libkdcraw }:
kde { kde {
buildInputs = buildInputs =
[ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2 ]; [ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2
baloo kfilemetadata libkdcraw ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View file

@ -1,6 +1,6 @@
{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime { kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison , akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
, nepomuk_widgets, kactivities, libXScrnSaver, qjson , nepomuk_widgets, kactivities, libXScrnSaver, qjson, baloo
, pkgconfig }: , pkgconfig }:
kde { kde {
@ -10,7 +10,7 @@ kde {
buildInputs = buildInputs =
[ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets
libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities
libXScrnSaver qjson libXScrnSaver qjson baloo
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View file

@ -1,5 +1,5 @@
{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig { kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
, boost, eigen, kde_workspace, attica, qca2, qimageblitz , boost, eigen2, kde_workspace, attica, qca2, qimageblitz
, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt , kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
, qjson, qoauth }: , qjson, qoauth }:
@ -10,7 +10,7 @@ kde {
KDEDIRS=marble; KDEDIRS=marble;
buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
eigen qca2 libXtst qimageblitz libqalculate eigen2 qca2 libXtst qimageblitz libqalculate
shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
]; ];

View file

@ -1,8 +1,8 @@
{ kde, kdelibs, kdepimlibs, boost }: { kde, kdelibs, kdepimlibs, boost, gpgme }:
kde { kde {
buildInputs = [ kdelibs kdepimlibs boost ]; buildInputs = [ kdelibs kdepimlibs boost gpgme ];
meta = { meta = {
description = "Simple KDE GUI for GPG"; description = "Simple KDE GUI for GPG";

View file

@ -11114,7 +11114,6 @@ let
}) ../desktops/kde-4.12; }) ../desktops/kde-4.12;
kde414 = kdePackagesFor (pkgs.kde414 // { kde414 = kdePackagesFor (pkgs.kde414 // {
eigen = eigen2;
libusb = libusb1; libusb = libusb1;
libcanberra = libcanberra_kde; libcanberra = libcanberra_kde;
}) ../desktops/kde-4.14; }) ../desktops/kde-4.14;