diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-06-07 08:47:19 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-06-07 08:47:19 -0500 |
| commit | dc7d5231d6cd5cf7acc4b0f73751edd54195b482 (patch) | |
| tree | 44622e72e95712fd984d942742b641cc1788a3f2 /nixos | |
| parent | d39d085adf8b8dd66a64a07199ad7e1080ad9da6 (diff) | |
| parent | 4eebb77df261457695b6580fcd2b56b7c04d93e6 (diff) | |
| download | nixpkgs-dc7d5231d6cd5cf7acc4b0f73751edd54195b482.tar nixpkgs-dc7d5231d6cd5cf7acc4b0f73751edd54195b482.tar.gz nixpkgs-dc7d5231d6cd5cf7acc4b0f73751edd54195b482.tar.bz2 nixpkgs-dc7d5231d6cd5cf7acc4b0f73751edd54195b482.tar.lz nixpkgs-dc7d5231d6cd5cf7acc4b0f73751edd54195b482.tar.xz nixpkgs-dc7d5231d6cd5cf7acc4b0f73751edd54195b482.tar.zst nixpkgs-dc7d5231d6cd5cf7acc4b0f73751edd54195b482.zip | |
Merge branch 'plasma-5'
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 2e9183da970..538300f5793 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -117,6 +117,9 @@ in # Install activity manager if available ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd + # frameworkintegration was split with plasma-integration in Plasma 5.6 + ++ lib.optional (lib.hasAttr "plasma-integration" kde5) kde5.plasma-integration + # Optional hardware support features ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm |