about summary refs log tree commit diff
path: root/nixos/modules/services/x11/desktop-managers/kde5.nix
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-11-22 10:27:39 -0600
committerThomas Tuegel <ttuegel@gmail.com>2015-11-23 06:39:09 -0600
commit38bf6452666af768e37bcc2a183d4db08ccf49e1 (patch)
treeca618bedb372244bdc99194dc2423c00f5c53c06 /nixos/modules/services/x11/desktop-managers/kde5.nix
parent6d51f06fcfd940c7bfbb7463ae606c99447d4704 (diff)
downloadnixlib-38bf6452666af768e37bcc2a183d4db08ccf49e1.tar
nixlib-38bf6452666af768e37bcc2a183d4db08ccf49e1.tar.gz
nixlib-38bf6452666af768e37bcc2a183d4db08ccf49e1.tar.bz2
nixlib-38bf6452666af768e37bcc2a183d4db08ccf49e1.tar.lz
nixlib-38bf6452666af768e37bcc2a183d4db08ccf49e1.tar.xz
nixlib-38bf6452666af768e37bcc2a183d4db08ccf49e1.tar.zst
nixlib-38bf6452666af768e37bcc2a183d4db08ccf49e1.zip
nixos/kde5: plasma-5.5 update
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers/kde5.nix')
-rw-r--r--nixos/modules/services/x11/desktop-managers/kde5.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 6fdd5b4fa36d..0e9aa60a0fc7 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -108,7 +108,7 @@ in
         kdeApps.okular
         kdeApps.print-manager
 
-        kdeApps.oxygen-icons
+        (plasma5.oxygen-icons or kf5.oxygen-icons5)
         pkgs.hicolor_icon_theme
 
         plasma5.kde-gtk-config
@@ -155,7 +155,7 @@ in
         GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
       };
 
-    fonts.fonts = [ plasma5.oxygen-fonts ];
+    fonts.fonts = [ (plasma5.oxygen-fonts or pkgs.noto-fonts) ];
 
     programs.ssh.askPassword = "${plasma5.ksshaskpass}/bin/ksshaskpass";