about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2016-03-11 08:47:33 -0600
committerThomas Tuegel <ttuegel@gmail.com>2016-03-11 08:47:33 -0600
commit41e7f3b9d838f73482856b8a379a441471757297 (patch)
treec8caa09526d70003a3fcba4540cb97a702c215e6 /nixos
parent0d6d91739f1257285bd31904775f6adc73c83ed4 (diff)
parentd8dceb7077a01e50f1add746acae640d7fb3e673 (diff)
downloadnixlib-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'
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/desktop-managers/kde5.nix1
1 files changed, 1 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