summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-10-29 15:51:48 -0500
committerThomas Tuegel <ttuegel@gmail.com>2015-10-31 08:48:53 -0500
commitafc364f1949fe1ffa53ccf76fb34796e22cdda0b (patch)
treea93a8817a6fa18d297d8a53ee090508c3c42ecc4 /pkgs/development
parent5e65741e41e948ca9ddd5177f6e17000e2698431 (diff)
downloadnixlib-afc364f1949fe1ffa53ccf76fb34796e22cdda0b.tar
nixlib-afc364f1949fe1ffa53ccf76fb34796e22cdda0b.tar.gz
nixlib-afc364f1949fe1ffa53ccf76fb34796e22cdda0b.tar.bz2
nixlib-afc364f1949fe1ffa53ccf76fb34796e22cdda0b.tar.lz
nixlib-afc364f1949fe1ffa53ccf76fb34796e22cdda0b.tar.xz
nixlib-afc364f1949fe1ffa53ccf76fb34796e22cdda0b.tar.zst
nixlib-afc364f1949fe1ffa53ccf76fb34796e22cdda0b.zip
Revert "kiconthemes: default theme is breeze"
This reverts commit 6454d8725b21fbd8c85acdda4cc1de4e8eb9c1a7.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.15/default.nix2
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.15/kiconthemes.nix (renamed from pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/default.nix)1
-rw-r--r--pkgs/development/libraries/kde-frameworks-5.15/kiconthemes/0001-default-icon-theme.patch25
3 files changed, 1 insertions, 27 deletions
diff --git a/pkgs/development/libraries/kde-frameworks-5.15/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/default.nix
index 52b76d3dfc43..6b6b95ab3c70 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
index 71114f68fb43..02b516afedc6 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 0470b32da738..000000000000
--- 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 <ttuegel@gmail.com>
-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
-