Merge branch 'colord-kde'

nixos/modules/services/x11/desktop-managers/kde5.nix

@@ -128,6 +128,7 @@ in
       ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
       ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa
       ++ lib.optional config.powerManagement.enable kde5.powerdevil
+      ++ lib.optional config.services.colord.enable kde5.colord-kde
       ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ]
 
       ++ lib.optionals cfg.phonon.gstreamer.enable

pkgs/tools/misc/colord-kde/0.5.nix

@@ -0,0 +1,29 @@
+{ stdenv, lib, fetchgit
+, extra-cmake-modules, ki18n
+, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
+, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
+, kitemviews, lcms2, libXrandr, qtx11extras
+}:
+
+stdenv.mkDerivation {
+  name = "colord-kde-0.5.0.20160224";
+  src = fetchgit {
+    url = "git://anongit.kde.org/colord-kde";
+    rev = "3729d1348c57902b74283bc8280ffb5561b221db";
+    sha256 = "03ww8nskgxl38dwkbb39by18gxvrcm6w2zg9s7q05i76rpl6kkkw";
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules ki18n ];
+
+  buildInputs = [
+    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    kcmutils kio knotifications plasma-framework kwidgetsaddons
+    kwindowsystem kitemviews lcms2 libXrandr qtx11extras
+  ];
+
+  meta = with lib; {
+    homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ttuegel ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -15278,6 +15278,8 @@ let
       libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };
     };
 
+    colord-kde = callPackage ../tools/misc/colord-kde/0.5.nix {};
+
     dfilemanager = callPackage ../applications/misc/dfilemanager { };
 
     fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };