diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-11-14 09:48:05 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-11-15 07:21:39 -0600 |
| commit | c9146d7e5f253c65d7c422ce2c7ee2a12261f83b (patch) | |
| tree | 22c564a11d72e4a8ad8633022655e045d01c61e9 /nixos | |
| parent | 87c4a20cb8be2559cc66297f1ad51738f2ed420b (diff) | |
| download | nixpkgs-c9146d7e5f253c65d7c422ce2c7ee2a12261f83b.tar nixpkgs-c9146d7e5f253c65d7c422ce2c7ee2a12261f83b.tar.gz nixpkgs-c9146d7e5f253c65d7c422ce2c7ee2a12261f83b.tar.bz2 nixpkgs-c9146d7e5f253c65d7c422ce2c7ee2a12261f83b.tar.lz nixpkgs-c9146d7e5f253c65d7c422ce2c7ee2a12261f83b.tar.xz nixpkgs-c9146d7e5f253c65d7c422ce2c7ee2a12261f83b.tar.zst nixpkgs-c9146d7e5f253c65d7c422ce2c7ee2a12261f83b.zip | |
kde5: don't install oxygen-icons5 if breeze-icons is present
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index bc010d1ce1c..07f6a402e81 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -141,13 +141,12 @@ in kde5.konsole kde5.print-manager - # Oxygen icons moved to KDE Frameworks 5.16 and later. - (kde5.oxygen-icons or kde5.oxygen-icons5) + # Install Breeze icons if available + (kde5.breeze-icons or kde5.oxygen-icons5 or kde5.oxygen-icons) pkgs.hicolor_icon_theme - kde5.kde-gtk-config + kde5.kde-gtk-config kde5.breeze-gtk - pkgs.phonon-backend-gstreamer pkgs.qt5.phonon-backend-gstreamer ] @@ -155,9 +154,6 @@ in # If it is not available, Orion is very similar to Breeze. ++ lib.optional (!(lib.hasAttr "breeze-gtk" kde5)) pkgs.orion - # Install Breeze icons if available - ++ lib.optional (lib.hasAttr "breeze-icons" kde5) kde5.breeze-icons - # Install activity manager if available ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd @@ -217,7 +213,6 @@ in kde5.ecm # for the setup-hook kde5.plasma-workspace kde5.breeze-icons - (kde5.oxygen-icons or kde5.oxygen-icons5) ]; }; |