From afc364f1949fe1ffa53ccf76fb34796e22cdda0b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 29 Oct 2015 15:51:48 -0500 Subject: [PATCH] Revert "kiconthemes: default theme is breeze" This reverts commit 6454d8725b21fbd8c85acdda4cc1de4e8eb9c1a7. --- .../libraries/kde-frameworks-5.15/default.nix | 2 +- .../default.nix => kiconthemes.nix} | 1 - .../kiconthemes/0001-default-icon-theme.patch | 25 ------------------- 3 files changed, 1 insertion(+), 27 deletions(-) rename pkgs/development/libraries/kde-frameworks-5.15/{kiconthemes/default.nix => kiconthemes.nix} (87%) delete mode 100644 pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.15/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/default.nix index 52b76d3dfc4..6b6b95ab3c7 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/default.nix @@ -69,7 +69,7 @@ let kguiaddons = callPackage ./kguiaddons.nix {}; khtml = callPackage ./khtml.nix {}; ki18n = callPackage ./ki18n.nix {}; - kiconthemes = callPackage ./kiconthemes {}; + kiconthemes = callPackage ./kiconthemes.nix {}; kidletime = callPackage ./kidletime.nix {}; kimageformats = callPackage ./kimageformats.nix {}; kinit = callPackage ./kinit {}; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix similarity index 87% rename from pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/default.nix rename to pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix index 71114f68fb4..02b516afedc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix @@ -4,7 +4,6 @@ kdeFramework { name = "kiconthemes"; - patches = [ ./0001-default-icon-theme.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfigwidgets kitemviews qtsvg ]; propagatedBuildInputs = [ ki18n ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch b/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch deleted file mode 100644 index 0470b32da73..00000000000 --- a/pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 61dd07a27b229d33ceb386e9f909773d5885999c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 27 Oct 2015 17:14:36 -0500 -Subject: [PATCH] default icon theme - ---- - src/kicontheme.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kicontheme.cpp b/src/kicontheme.cpp -index d0ab4b9..dce7773 100644 ---- a/src/kicontheme.cpp -+++ b/src/kicontheme.cpp -@@ -542,7 +542,7 @@ void KIconTheme::reconfigure() - // static - QString KIconTheme::defaultThemeName() - { -- return QLatin1String("oxygen"); -+ return QLatin1String("breeze"); - } - - void KIconTheme::assignIconsToContextMenu(ContextMenus type, --- -2.6.2 -