diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-03-11 08:47:33 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-03-11 08:47:33 -0600 |
| commit | 41e7f3b9d838f73482856b8a379a441471757297 (patch) | |
| tree | c8caa09526d70003a3fcba4540cb97a702c215e6 | |
| parent | 0d6d91739f1257285bd31904775f6adc73c83ed4 (diff) | |
| parent | d8dceb7077a01e50f1add746acae640d7fb3e673 (diff) | |
| download | nixlib-41e7f3b9d838f73482856b8a379a441471757297.tar nixlib-41e7f3b9d838f73482856b8a379a441471757297.tar.gz nixlib-41e7f3b9d838f73482856b8a379a441471757297.tar.bz2 nixlib-41e7f3b9d838f73482856b8a379a441471757297.tar.lz nixlib-41e7f3b9d838f73482856b8a379a441471757297.tar.xz nixlib-41e7f3b9d838f73482856b8a379a441471757297.tar.zst nixlib-41e7f3b9d838f73482856b8a379a441471757297.zip | |
Merge branch 'colord-kde'
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/misc/colord-kde/0.5.nix | 29 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 32 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 867dea63cc22..9891da2169ea 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/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 diff --git a/pkgs/tools/misc/colord-kde/0.5.nix b/pkgs/tools/misc/colord-kde/0.5.nix new file mode 100644 index 000000000000..9df8ace38f66 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a058eb409c97..603e451116c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { }; |