summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-02-21 11:01:10 -0600
committerThomas Tuegel <ttuegel@gmail.com>2015-02-21 11:39:21 -0600
commite5de75bf2a60120083cf47259a84fdb41a2be467 (patch)
tree4862604cae1af3d6ca234bee59b4be16c0b5a621 /nixos
parentb050babd3eb8144a6789c32de5529e2cadbeb800 (diff)
downloadnixpkgs-e5de75bf2a60120083cf47259a84fdb41a2be467.tar
nixpkgs-e5de75bf2a60120083cf47259a84fdb41a2be467.tar.gz
nixpkgs-e5de75bf2a60120083cf47259a84fdb41a2be467.tar.bz2
nixpkgs-e5de75bf2a60120083cf47259a84fdb41a2be467.tar.lz
nixpkgs-e5de75bf2a60120083cf47259a84fdb41a2be467.tar.xz
nixpkgs-e5de75bf2a60120083cf47259a84fdb41a2be467.tar.zst
nixpkgs-e5de75bf2a60120083cf47259a84fdb41a2be467.zip
kde5: install kde-frameworks version used by plasma
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/desktop-managers/kde5.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 4842197d4e4..db9de9835b5 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" ];