Merge remote-tracking branch 'origin/master' into systemd-219

Conflicts:
	pkgs/development/libraries/libseccomp/default.nix

1 files changed, 62 insertions, 17 deletions

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 798d6d977b0d..9cab1775c425 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -34,8 +34,8 @@ let
       "Kexiv2" = "libkexiv2";
       "Kdcraw" = "libkdcraw";
       "Kipi" = "libkipi";
-      "LibKMahjongg" = "libkmahjongg";
       "LibKonq" = "kde-baseapps";
+      "Marble" = "marble";
     };
 
   mkDerivation = drv: kf5.mkDerivation (drv // {
@@ -63,6 +63,7 @@ let
     (with pkgs;
       {
         ACL = acl;
+        AccountsQt5 = accounts-qt.override { inherit qt5; };
         Akonadi = kde4.akonadi;
         Alsa = alsaLib;
         Automoc4 = automoc4;
@@ -70,9 +71,10 @@ let
         BISON = bison;
         Baloo = kde4.baloo;
         Boost = boost156;
+        CFitsio = cfitsio;
+        CUPS = cups;
         Canberra = libcanberra;
         Cdparanoia = cdparanoia;
-        CUPS = cups;
         DBusMenuQt = libdbusmenu_qt;
         DjVuLibre = djvulibre;
         ENCHANT = enchant;
@@ -90,15 +92,20 @@ let
         Gpgme = gpgme;
         Gphoto2 = libgphoto2;
         Grantlee = grantlee;
+        Grantlee5 = grantlee5;
         GSL = gsl;
         HUNSPELL = hunspell;
         HUpnp = herqq;
+        INDI = indilib;
+        Intltool = intltool;
         Jasper = jasper;
         KActivities = kde4.kactivities;
+        KDEGames = kde4.libkdegames;
         LCMS2 = lcms2;
         Ldap = openldap;
         LibAttica = attica;
         LibGcrypt = libgcrypt;
+        LibKMahjongg = kde4.libkmahjongg;
         LibSSH = libssh;
         LibSpectre = libspectre;
         LibVNCServer = libvncserver;
@@ -114,12 +121,14 @@ let
         PythonLibrary = python;
         Qalculate = libqalculate;
         QCA2 = qca2;
+        Qca-qt5 = qca-qt5.override { inherit qt5; };
         QImageBlitz = qimageblitz;
         QJSON = qjson;
         Qt4 = qt4;
         Samba = samba;
         Sasl2 = cyrus_sasl;
         SharedDesktopOntologies = shared_desktop_ontologies;
+        SignOnQt5 = signon.override { inherit qt5; };
         SndFile = libsndfile;
         Speechd = speechd;
         TIFF = libtiff;
@@ -129,6 +138,7 @@ let
         TunePimp = libtunepimp;
         UDev = udev;
         USB = libusb;
+        Xplanet = xplanet;
         Xscreensaver = xscreensaver;
         Xsltproc = libxslt;
       }
@@ -191,17 +201,9 @@ let
         nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig];
       };
 
-      kaccounts-integration =
-        let accounts-qt = pkgs.accounts-qt.override { inherit qt5; };
-            signon = pkgs.signon.override { inherit qt5; };
-        in super.kaccounts-integration // {
-          buildInputs = super.kaccounts-integration.buildInputs
-            ++ [ accounts-qt signon ];
-        };
-
       kaccounts-providers = super.kaccounts-providers // {
         buildInputs = super.kaccounts-providers.buildInputs
-          ++ (with pkgs; [ intltool libaccounts-glib ]);
+          ++ (with pkgs; [ libaccounts-glib ]);
         preConfigure = ''
           ${super.kaccounts-providers.preConfigure or ""}
           substituteInPlace webkit-options/CMakeLists.txt \
@@ -301,6 +303,12 @@ let
         buildInputs = super.kgpg.buildInputs ++ [boost];
       };
 
+      khangman = super.khangman // {
+        buildInputs =
+          super.khangman.buildInputs
+          ++ [ kf5.kio ];
+      };
+
       kmix = with pkgs; super.kmix // {
         nativeBuildInputs = super.kmix.nativeBuildInputs ++ [pkgconfig];
         cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
@@ -319,7 +327,33 @@ let
       krfb = super.krfb // {
         buildInputs =
           super.krfb.buildInputs
-          ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals];
+          ++ [pkgs.xlibs.libXtst kdeApps.ktp-common-internals];
+      };
+
+      kstars = super.kstars // {
+        buildInputs =
+          super.kstars.buildInputs
+          ++ (with kf5; [ kparts ])
+          ++ [ pkgs.cfitsio ];
+      };
+
+      ktp-accounts-kcm = super.ktp-accounts-kcm // {
+        buildInputs =
+          super.ktp-accounts-kcm.buildInputs
+          ++ [ pkgs.libaccounts-glib ];
+      };
+
+      ktp-common-internals = super.ktp-common-internals // {
+        buildInputs =
+          super.ktp-common-internals.buildInputs
+          ++ (with kf5; [ kdelibs4support kparts ])
+          ++ [ pkgs.libotr ]; # needed for ktp-text-ui
+      };
+
+      lokalize = super.lokalize // {
+        buildInputs =
+          super.lokalize.buildInputs
+          ++ [ kf5.kdbusaddons ];
       };
 
       libkdcraw = with pkgs; super.libkdcraw // {
@@ -335,6 +369,14 @@ let
         buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
       };
 
+      libkgeomap = super.libkgeomap // {
+        cmakeFlags =
+          (super.libkgeomap.cmakeFlags or [])
+          ++ [
+            "-DCMAKE_MODULE_PATH=${kdeApps.marble}/share/apps/cmake/modules"
+          ];
+      };
+
       libkipi = with pkgs; super.libkipi // {
         buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
       };
@@ -343,11 +385,14 @@ let
         buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
       };
 
-      marble = super.marble // {
-        preConfigure = ''
-          ${super.preConfigure or ""}
-          cmakeFlags="$cmakeFlags -DCMAKE_MODULES_INSTALL_PATH=$out/lib/cmake"
-        '';
+      okular = super.okular // {
+        nativeBuildInputs =
+          super.okular.nativeBuildInputs
+          ++ [ pkgs.pkgconfig ];
+      };
+
+      rocs = super.rocs // {
+        buildInputs = super.rocs.buildInputs ++ (with kf5; [ kdelibs4support ]);
       };
 
       signon-kwallet-extension =