Merge pull request #11781 from ttuegel/kiconthemes

kde5.kiconthemes: default icon theme is breeze
This commit is contained in:
Thomas Tuegel 2015-12-17 06:15:37 -06:00
commit 9b26afff6e
4 changed files with 20 additions and 5 deletions

View File

@ -70,7 +70,7 @@ let
kguiaddons = callPackage ./kguiaddons.nix {};
khtml = callPackage ./khtml.nix {};
ki18n = callPackage ./ki18n.nix {};
kiconthemes = callPackage ./kiconthemes.nix {};
kiconthemes = callPackage ./kiconthemes {};
kidletime = callPackage ./kidletime.nix {};
kimageformats = callPackage ./kimageformats.nix {};
kinit = callPackage ./kinit {};

View File

@ -0,0 +1,13 @@
Index: kiconthemes-5.17.0/src/kicontheme.cpp
===================================================================
--- kiconthemes-5.17.0.orig/src/kicontheme.cpp
+++ kiconthemes-5.17.0/src/kicontheme.cpp
@@ -557,7 +557,7 @@ void KIconTheme::reconfigure()
// static
QString KIconTheme::defaultThemeName()
{
- return QStringLiteral("oxygen");
+ return QStringLiteral("breeze");
}
void KIconTheme::assignIconsToContextMenu(ContextMenus type,

View File

@ -1,13 +1,14 @@
{ kdeFramework, lib, makeQtWrapper
, extra-cmake-modules, kconfigwidgets, ki18n
, kitemviews, qtsvg
{ kdeFramework, lib, copyPathsToStore
, extra-cmake-modules, makeQtWrapper
, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
}:
kdeFramework {
name = "kiconthemes";
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [ kconfigwidgets kitemviews qtsvg ];
propagatedBuildInputs = [ ki18n ];
propagatedBuildInputs = [ breeze-icons ki18n ];
postInstall = ''
wrapQtProgram "$out/bin/kiconfinder5"
'';

View File

@ -0,0 +1 @@
default-theme-breeze.patch