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

kde5: don't install oxygen-icons5 if breeze-icons is present

Browse Source
This commit is contained in:
Thomas Tuegel 2016-11-14 09:48:05 -06:00
parent 87c4a20cb8
commit c9146d7e5f
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)
];
};