boost: Update depdendent packages

13 files changed, 17 insertions, 15 deletions

diff --git a/pkgs/desktops/kde-4.12/kde-workspace.nix b/pkgs/desktops/kde-4.12/kde-workspace.nix
index 537beaac6ae6..38e28225d94a 100644
--- a/pkgs/desktops/kde-4.12/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.12/kde-workspace.nix
@@ -20,7 +20,7 @@ kde {
       xorg.libxkbfile xorg.libXcomposite  xorg.libXtst
       xorg.libXdamage
 
-      python boost qjson lm_sensors gpsd libraw1394 pciutils udev
+      python boost boost.lib qjson lm_sensors gpsd libraw1394 pciutils udev
       akonadi pam libusb1 libqalculate kdepimlibs  prison
       kactivities
     ];
diff --git a/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
index 64e196452e31..b298cdbc8167 100644
--- a/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
+++ b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
@@ -9,7 +9,7 @@ kde {
 
   buildInputs = [
     python kdepimlibs shared_desktop_ontologies
-    boost polkit_qt_1
+    boost boost.lib polkit_qt_1
   ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/kde-4.12/kdeedu/kig.nix b/pkgs/desktops/kde-4.12/kdeedu/kig.nix
index 37906c32bcb2..fb442e2ef629 100644
--- a/pkgs/desktops/kde-4.12/kdeedu/kig.nix
+++ b/pkgs/desktops/kde-4.12/kdeedu/kig.nix
@@ -1,6 +1,6 @@
 { kde, kdelibs, boost, python}:
 kde {
-  buildInputs = [ kdelibs boost python ];
+  buildInputs = [ kdelibs boost boost.lib python ];
 
   cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1";
   meta = {
diff --git a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix
index ce30d11fda31..135598ded90a 100644
--- a/pkgs/desktops/kde-4.12/kdeedu/rocs.nix
+++ b/pkgs/desktops/kde-4.12/kdeedu/rocs.nix
@@ -1,7 +1,9 @@
 { kde, kdelibs, boost, grantlee }:
-
+let
+  boostpkg = boost.override { enableExceptions = true; };
+in
 kde {
-  buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ];
+  buildInputs = [ kdelibs boostpkg boostpkg.lib grantlee ];
 
   NIX_CFLAGS_COMPILE = "-fexceptions";
 
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix
index e838d84fc5eb..9a76863c8e04 100644
--- a/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kdenetwork-strigi-analyzers.nix
@@ -1,7 +1,7 @@
 { kde, kdelibs, boost }:
 
 kde {
-  buildInputs = [ kdelibs boost ];
+  buildInputs = [ kdelibs boost boost.lib ];
 
   meta = {
     description = "Strigi analyzers for various network protocols";
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kget.nix b/pkgs/desktops/kde-4.12/kdenetwork/kget.nix
index f986da2de214..d7527ca6a60d 100644
--- a/pkgs/desktops/kde-4.12/kdenetwork/kget.nix
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kget.nix
@@ -8,7 +8,7 @@ kde {
 
   buildInputs =
     [ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2
-      libmms kde_baseapps kde_workspace boost ];
+      libmms kde_baseapps kde_workspace boost boost.lib ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix
index 7d8aec21ce6c..e8eab764419a 100644
--- a/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix
+++ b/pkgs/desktops/kde-4.12/kdenetwork/kopete.nix
@@ -10,7 +10,7 @@ kde {
   buildInputs = [
     kdelibs qca2 mediastreamer libgadu jsoncpp
     kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib
-    libidn libxslt boost
+    libidn libxslt boost boost.lib
     ortp srtp libv4l
   ];
 
diff --git a/pkgs/desktops/kde-4.12/kdepim-runtime.nix b/pkgs/desktops/kde-4.12/kdepim-runtime.nix
index d92e22548206..484d3e1933a2 100644
--- a/pkgs/desktops/kde-4.12/kdepim-runtime.nix
+++ b/pkgs/desktops/kde-4.12/kdepim-runtime.nix
@@ -5,7 +5,7 @@ kde {
 # TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml
 
   buildInputs = [
-    kdepimlibs akonadi boost shared_desktop_ontologies
+    kdepimlibs akonadi boost boost.lib shared_desktop_ontologies
     libxslt
   ];
 
diff --git a/pkgs/desktops/kde-4.12/kdeplasma-addons.nix b/pkgs/desktops/kde-4.12/kdeplasma-addons.nix
index 550099830d91..afc925c79aab 100644
--- a/pkgs/desktops/kde-4.12/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-4.12/kdeplasma-addons.nix
@@ -9,8 +9,8 @@ kde {
 
   KDEDIRS=marble;
 
-  buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
-                  eigen qca2 libXtst qimageblitz libqalculate 
+  buildInputs = [ kdelibs boost boost.lib kde_workspace kdepimlibs attica qjson
+                  qoauth eigen qca2 libXtst qimageblitz libqalculate
                   shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
   ];
 
diff --git a/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix
index e83a2d9a901b..2dbccdef9450 100644
--- a/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix
+++ b/pkgs/desktops/kde-4.12/kdesdk/umbrello.nix
@@ -1,7 +1,7 @@
 { kde, kdelibs, libxml2, libxslt, boost }:
 
 kde {
-  buildInputs = [ kdelibs libxml2 libxslt boost ];
+  buildInputs = [ kdelibs libxml2 libxslt boost boost.lib ];
 
   meta = {
     description = "Umbrello UML modeller";
diff --git a/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix
index 3ff1a286ae58..11b62f499a47 100644
--- a/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix
+++ b/pkgs/desktops/kde-4.12/kdeutils/kgpg.nix
@@ -2,7 +2,7 @@
 
 kde {
 
-  buildInputs = [ kdelibs kdepimlibs boost ];
+  buildInputs = [ kdelibs kdepimlibs boost boost.lib ];
 
   meta = {
     description = "Simple KDE GUI for GPG";
diff --git a/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix
index 918512e2b2de..36630ef8fc69 100644
--- a/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix
+++ b/pkgs/desktops/kde-4.12/kdewebdev/klinkstatus.nix
@@ -4,7 +4,7 @@ kde {
 
 # todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
 
-  buildInputs = [ kdelibs kdepimlibs htmlTidy boost ];
+  buildInputs = [ kdelibs kdepimlibs htmlTidy boost boost.lib ];
 
   meta = {
     description = "A KDE link checker";
diff --git a/pkgs/desktops/kde-4.12/support/akonadi/default.nix b/pkgs/desktops/kde-4.12/support/akonadi/default.nix
index d51996e3bc1e..824fd3e6616b 100644
--- a/pkgs/desktops/kde-4.12/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.12/support/akonadi/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc";
   };
 
-  buildInputs = [ qt4 soprano libxslt boost sqlite ];
+  buildInputs = [ qt4 soprano libxslt boost boost.lib sqlite ];
 
   nativeBuildInputs = [ cmake automoc4 shared_mime_info ];