public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kde5: always use plasma-nm

This commit is contained in:
Thomas Tuegel 2015-02-21 13:59:28 -06:00
parent ac2c57ea2c
commit 68f2db74ff
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/services/x11/desktop-managers/kde5.nix
View File

@ -88,18 +88,6 @@ in
}; };
environment.systemPackages = environment.systemPackages =
(builtins.attrValues
(removeAttrs plasma5
[ "deepOverride" "kf5" "override" "overrideDerivation"
"recurseForDerivations" "scope"
]))
++
(builtins.attrValues
(removeAttrs kf5
[ "deepOverride" "mkDerivation" "override" "overrideDerivation"
"recurseForDerivations" "qt5" "scope"
]))
++
[ [
pkgs.qt4 # qtconfig is the only way to set Qt 4 theme pkgs.qt4 # qtconfig is the only way to set Qt 4 theme
@ -115,7 +103,8 @@ in
pkgs.orion # GTK theme, nearly identical to Breeze pkgs.orion # GTK theme, nearly identical to Breeze
] ]
++ (optional config.networking.networkmanager.enable plasma5.plasma-nm) ++ filter isDerivation (builtins.attrValues plasma5)
++ filter isDerivation (builtins.attrValues kf5)
++ phononBackendPackages; ++ phononBackendPackages;
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];