From 0e8e45f3ab3cfd4b57d8ee52b8b88bf3412242c0 Mon Sep 17 00:00:00 2001
From: "ambrop7@gmail.com" <Ambroz Bizjak>
Date: Sun, 21 Sep 2014 22:49:35 +0200
Subject: [PATCH] kde-4.14: Make it all build.

---
 pkgs/desktops/kde-4.14/kdeedu/kalzium.nix       | 4 ++--
 pkgs/desktops/kde-4.14/kdeedu/kstars.nix        | 4 ++--
 pkgs/desktops/kde-4.14/kdeedu/step.nix          | 4 ++--
 pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix | 5 +++--
 pkgs/desktops/kde-4.14/kdepim.nix               | 4 ++--
 pkgs/desktops/kde-4.14/kdeplasma-addons.nix     | 4 ++--
 pkgs/desktops/kde-4.14/kdeutils/kgpg.nix        | 4 ++--
 pkgs/top-level/all-packages.nix                 | 1 -
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix
index 09de79ce1c05..8338eee55110 100644
--- a/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix
+++ b/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix
@@ -1,9 +1,9 @@
-{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro, pkgconfig }:
+{ kde, kdelibs, facile, ocaml, eigen2, eigen, openbabel, avogadro, pkgconfig }:
 kde {
 
 # TODO: chemical mime data
 
-  buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
+  buildInputs = [ kdelibs facile ocaml eigen2 eigen openbabel avogadro ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kstars.nix b/pkgs/desktops/kde-4.14/kdeedu/kstars.nix
index 0832dc2121e2..a5e9bee180e1 100644
--- a/pkgs/desktops/kde-4.14/kdeedu/kstars.nix
+++ b/pkgs/desktops/kde-4.14/kdeedu/kstars.nix
@@ -1,10 +1,10 @@
-{ kde, kdelibs, eigen, xplanet, indilib, pkgconfig }:
+{ kde, kdelibs, eigen, xplanet, indilib_0_9_9, pkgconfig, qjson }:
 
 kde {
 
 # TODO: wcslib, astrometry
 
-  buildInputs = [ kdelibs eigen xplanet indilib ];
+  buildInputs = [ kdelibs eigen xplanet indilib_0_9_9 qjson ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/desktops/kde-4.14/kdeedu/step.nix b/pkgs/desktops/kde-4.14/kdeedu/step.nix
index f36ccef9b7cd..95e991e84815 100644
--- a/pkgs/desktops/kde-4.14/kdeedu/step.nix
+++ b/pkgs/desktops/kde-4.14/kdeedu/step.nix
@@ -1,8 +1,8 @@
-{ kde, kdelibs, gsl, libqalculate, eigen, pkgconfig }:
+{ kde, kdelibs, gsl, libqalculate, eigen2, pkgconfig }:
 
 kde {
 
-  buildInputs = [ kdelibs gsl libqalculate eigen ];
+  buildInputs = [ kdelibs gsl libqalculate eigen2 ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix
index 3ce9b3dcc78a..66a7c79a42bc 100644
--- a/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix
+++ b/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix
@@ -1,10 +1,11 @@
 { stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core
-, libjpeg, pkgconfig, kactivities, lcms2 }:
+, libjpeg, pkgconfig, kactivities, lcms2, baloo, kfilemetadata, libkdcraw }:
 
 kde {
 
   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 ];
 
diff --git a/pkgs/desktops/kde-4.14/kdepim.nix b/pkgs/desktops/kde-4.14/kdepim.nix
index 4f364648d238..9f266e596a61 100644
--- a/pkgs/desktops/kde-4.14/kdepim.nix
+++ b/pkgs/desktops/kde-4.14/kdepim.nix
@@ -1,6 +1,6 @@
 { kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
 , akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
-, nepomuk_widgets, kactivities, libXScrnSaver, qjson
+, nepomuk_widgets, kactivities, libXScrnSaver, qjson, baloo
 , pkgconfig }:
 
 kde {
@@ -10,7 +10,7 @@ kde {
   buildInputs =
     [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets
       libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities
-      libXScrnSaver qjson
+      libXScrnSaver qjson baloo
     ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix
index 550099830d91..2b1f1628cf1d 100644
--- a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix
@@ -1,5 +1,5 @@
 { 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
 , qjson, qoauth }:
 
@@ -10,7 +10,7 @@ kde {
   KDEDIRS=marble;
 
   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
   ];
 
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix
index 3ff1a286ae58..b3f95356d132 100644
--- a/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix
+++ b/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix
@@ -1,8 +1,8 @@
-{ kde, kdelibs, kdepimlibs, boost }:
+{ kde, kdelibs, kdepimlibs, boost, gpgme }:
 
 kde {
 
-  buildInputs = [ kdelibs kdepimlibs boost ];
+  buildInputs = [ kdelibs kdepimlibs boost gpgme ];
 
   meta = {
     description = "Simple KDE GUI for GPG";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2420bb877176..dce5819915c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11114,7 +11114,6 @@ let
     }) ../desktops/kde-4.12;
 
   kde414 = kdePackagesFor (pkgs.kde414 // {
-      eigen = eigen2;
       libusb = libusb1;
       libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.14;