From e5de75bf2a60120083cf47259a84fdb41a2be467 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 21 Feb 2015 11:01:10 -0600 Subject: kde5: install kde-frameworks version used by plasma --- nixos/modules/services/x11/desktop-managers/kde5.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 4842197d4e40..db9de9835b5b 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -35,7 +35,7 @@ let phononBackendPackages = flip concatMap cfg.phononBackends (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends); - kf5 = pkgs.kf5_stable; + kf5 = plasma5.kf5; plasma5 = pkgs.plasma5_stable; @@ -87,17 +87,17 @@ in setuid = true; }; - environment.systemPackages = with plasma5; with kf5; + environment.systemPackages = (builtins.attrValues (removeAttrs plasma5 - [ "deepOverride" "override" "overrideDerivation" + [ "deepOverride" "kf5" "override" "overrideDerivation" "recurseForDerivations" "scope" ])) ++ (builtins.attrValues (removeAttrs kf5 - [ "deepOverride" "extra-cmake-modules" "mkDerivation" "override" - "overrideDerivation" "recurseForDerivations" "scope" + [ "deepOverride" "mkDerivation" "override" "overrideDerivation" + "recurseForDerivations" "qt5" "scope" ])) ++ [ @@ -115,7 +115,7 @@ in pkgs.orion # GTK theme, nearly identical to Breeze ] - ++ (optional config.networking.networkmanager.enable plasma-nm) + ++ (optional config.networking.networkmanager.enable plasma5.plasma-nm) ++ phononBackendPackages; environment.pathsToLink = [ "/share" ]; -- cgit 1.4.1