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

kde5: install kde-frameworks version used by plasma

Browse Source
This commit is contained in:
Thomas Tuegel 2015-02-21 11:01:10 -06:00
parent b050babd3e
commit e5de75bf2a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ let
phononBackendPackages = flip concatMap cfg.phononBackends phononBackendPackages = flip concatMap cfg.phononBackends
(name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends); (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
kf5 = pkgs.kf5_stable; kf5 = plasma5.kf5;
plasma5 = pkgs.plasma5_stable; plasma5 = pkgs.plasma5_stable;
@ -87,17 +87,17 @@ in
setuid = true; setuid = true;
}; };
environment.systemPackages = with plasma5; with kf5; environment.systemPackages =
(builtins.attrValues (builtins.attrValues
(removeAttrs plasma5 (removeAttrs plasma5
[ "deepOverride" "override" "overrideDerivation" [ "deepOverride" "kf5" "override" "overrideDerivation"
"recurseForDerivations" "scope" "recurseForDerivations" "scope"
])) ]))
++ ++
(builtins.attrValues (builtins.attrValues
(removeAttrs kf5 (removeAttrs kf5
[ "deepOverride" "extra-cmake-modules" "mkDerivation" "override" [ "deepOverride" "mkDerivation" "override" "overrideDerivation"
"overrideDerivation" "recurseForDerivations" "scope" "recurseForDerivations" "qt5" "scope"
])) ]))
++ ++
[ [
@ -115,7 +115,7 @@ in
pkgs.orion # GTK theme, nearly identical to Breeze pkgs.orion # GTK theme, nearly identical to Breeze
] ]
++ (optional config.networking.networkmanager.enable plasma-nm) ++ (optional config.networking.networkmanager.enable plasma5.plasma-nm)
++ phononBackendPackages; ++ phononBackendPackages;
environment.pathsToLink = [ "/share" ]; environment.pathsToLink = [ "/share" ];