diff options
| author | Robin Gloster <mail@glob.in> | 2016-03-15 01:44:24 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-03-15 01:44:24 +0000 |
| commit | 3f45f0948d6fe158bed063adb66850ded0ba4861 (patch) | |
| tree | ac717689d391d3f5333132fc34e4b2aed829414c /nixos/modules/services/x11/desktop-managers/kde5.nix | |
| parent | a9b942c0617b1cd5f0732d05eadad0114a178f37 (diff) | |
| parent | d227d9a70e41d65e4e6f4ac75a9d243c5a19fa85 (diff) | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers/kde5.nix')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 1 |
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 867dea63cc226..9891da2169ea5 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 |