From cc78b5b51171b7919e329febc9ba5d68cdfd4b82 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 26 Apr 2026 15:46:12 +0300 Subject: [PATCH] treewide: switch to KF6 version of breeze-icons --- pkgs/by-name/be/beauty-line-icon-theme/package.nix | 5 +++-- pkgs/by-name/ca/canta-theme/package.nix | 1 + pkgs/by-name/fl/flat-remix-icon-theme/package.nix | 5 +++-- pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix | 5 +++-- pkgs/by-name/la/la-capitaine-icon-theme/package.nix | 5 +++-- pkgs/by-name/nu/numix-icon-theme-circle/package.nix | 1 + pkgs/by-name/nu/numix-icon-theme-square/package.nix | 1 + pkgs/by-name/nu/numix-icon-theme/package.nix | 5 +++-- pkgs/by-name/or/oranchelo-icon-theme/package.nix | 5 +++-- pkgs/by-name/pa/papirus-maia-icon-theme/package.nix | 4 ++-- pkgs/by-name/re/reversal-icon-theme/package.nix | 1 + pkgs/by-name/te/tela-circle-icon-theme/package.nix | 5 +++-- pkgs/by-name/te/tela-icon-theme/package.nix | 5 +++-- pkgs/by-name/za/zafiro-icons/package.nix | 5 +++-- 14 files changed, 33 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/be/beauty-line-icon-theme/package.nix b/pkgs/by-name/be/beauty-line-icon-theme/package.nix index c92199cd7dc0..b8ba0688b122 100644 --- a/pkgs/by-name/be/beauty-line-icon-theme/package.nix +++ b/pkgs/by-name/be/beauty-line-icon-theme/package.nix @@ -8,7 +8,7 @@ mint-x-icons, pantheon, jdupes, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation { @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation { # ubuntu-mono is also required but missing in ubuntu-themes (please add it if it is packaged at some point) propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme hicolor-icon-theme mint-x-icons @@ -40,6 +40,7 @@ stdenvNoCC.mkDerivation { dontPatchELF = true; dontRewriteSymlinks = true; + dontWrapQtApps = true; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ca/canta-theme/package.nix b/pkgs/by-name/ca/canta-theme/package.nix index a51dce1f9bdb..b4b9c5bed454 100644 --- a/pkgs/by-name/ca/canta-theme/package.nix +++ b/pkgs/by-name/ca/canta-theme/package.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' patchShebangs . diff --git a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix index 18f55e5cbda9..eb89a4959e9f 100644 --- a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix +++ b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix @@ -6,7 +6,7 @@ pantheon, gnome-icon-theme, hicolor-icon-theme, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons pantheon.elementary-icon-theme gnome-icon-theme hicolor-icon-theme @@ -33,6 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontFixup = true; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' mkdir -p $out/share/icons diff --git a/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix b/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix index 1095643dbd14..2dc7bfc5e29c 100644 --- a/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix +++ b/pkgs/by-name/gr/gruvbox-dark-icons-gtk/package.nix @@ -5,7 +5,7 @@ gtk3, gnome-icon-theme, hicolor-icon-theme, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ gtk3 ]; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme hicolor-icon-theme ]; @@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; dontDropIconThemeCache = true; + dontWrapQtApps = true; meta = { description = "Gruvbox icons for GTK based desktop environments"; diff --git a/pkgs/by-name/la/la-capitaine-icon-theme/package.nix b/pkgs/by-name/la/la-capitaine-icon-theme/package.nix index e3dd010f7098..c8cc7dba86ca 100644 --- a/pkgs/by-name/la/la-capitaine-icon-theme/package.nix +++ b/pkgs/by-name/la/la-capitaine-icon-theme/package.nix @@ -5,7 +5,7 @@ gnome-icon-theme, hicolor-icon-theme, pantheon, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -20,13 +20,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons pantheon.elementary-icon-theme gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; postPatch = '' patchShebangs configure diff --git a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix index 157065023948..63783b327735 100644 --- a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix @@ -27,6 +27,7 @@ stdenvNoCC.mkDerivation rec { ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/nu/numix-icon-theme-square/package.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix index 70f459769eff..1c09f1898995 100644 --- a/pkgs/by-name/nu/numix-icon-theme-square/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme-square/package.nix @@ -27,6 +27,7 @@ stdenvNoCC.mkDerivation rec { ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/nu/numix-icon-theme/package.nix b/pkgs/by-name/nu/numix-icon-theme/package.nix index 8438f544d88d..8a47d2c4bd56 100644 --- a/pkgs/by-name/nu/numix-icon-theme/package.nix +++ b/pkgs/by-name/nu/numix-icon-theme/package.nix @@ -7,7 +7,7 @@ gnome-icon-theme, hicolor-icon-theme, gitUpdater, - libsForQt5, + kdePackages, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -27,12 +27,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { propagatedBuildInputs = [ adwaita-icon-theme - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/or/oranchelo-icon-theme/package.nix b/pkgs/by-name/or/oranchelo-icon-theme/package.nix index fb396745f57d..5be293cff3e4 100644 --- a/pkgs/by-name/or/oranchelo-icon-theme/package.nix +++ b/pkgs/by-name/or/oranchelo-icon-theme/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, gtk3, - plasma5Packages, + kdePackages, hicolor-icon-theme, }: @@ -23,11 +23,12 @@ stdenvNoCC.mkDerivation rec { ]; propagatedBuildInputs = [ - plasma5Packages.breeze-icons + kdePackages.breeze-icons hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; makeFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix b/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix index 09d47a182a21..dfe02f4359f5 100644 --- a/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix +++ b/pkgs/by-name/pa/papirus-maia-icon-theme/package.nix @@ -7,7 +7,7 @@ gnome-icon-theme, papirus-icon-theme, hicolor-icon-theme, - libsForQt5, + kdePackages, }: stdenv.mkDerivation { @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme papirus-icon-theme hicolor-icon-theme diff --git a/pkgs/by-name/re/reversal-icon-theme/package.nix b/pkgs/by-name/re/reversal-icon-theme/package.nix index 6d0d52b413f0..ef7cfcf649c8 100644 --- a/pkgs/by-name/re/reversal-icon-theme/package.nix +++ b/pkgs/by-name/re/reversal-icon-theme/package.nix @@ -60,6 +60,7 @@ lib.checkListOfEnum "${pname}: color variants" # Package may install many small files. dontPatchELF = true; dontRewriteSymlinks = true; + dontWrapQtApps = true; # FIXME: https://github.com/yeyushengfan258/Reversal-icon-theme/issues/108 dontCheckForBrokenSymlinks = true; diff --git a/pkgs/by-name/te/tela-circle-icon-theme/package.nix b/pkgs/by-name/te/tela-circle-icon-theme/package.nix index 79e5e9bfe70c..32e86eb997c9 100644 --- a/pkgs/by-name/te/tela-circle-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-circle-icon-theme/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, adwaita-icon-theme, - libsForQt5, + kdePackages, gtk3, hicolor-icon-theme, jdupes, @@ -52,11 +52,12 @@ lib.checkListOfEnum "tela-circle-icon-theme: color variants" propagatedBuildInputs = [ adwaita-icon-theme - libsForQt5.breeze-icons + kdePackages.breeze-icons hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; # These fixup steps are slow and unnecessary for this package. # Package may install almost 400 000 small files. diff --git a/pkgs/by-name/te/tela-icon-theme/package.nix b/pkgs/by-name/te/tela-icon-theme/package.nix index 7af830eb456b..5d9d9ed04f69 100644 --- a/pkgs/by-name/te/tela-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-icon-theme/package.nix @@ -5,7 +5,7 @@ gtk3, jdupes, adwaita-icon-theme, - libsForQt5, + kdePackages, hicolor-icon-theme, }: @@ -27,11 +27,12 @@ stdenvNoCC.mkDerivation rec { propagatedBuildInputs = [ adwaita-icon-theme - libsForQt5.breeze-icons + kdePackages.breeze-icons hicolor-icon-theme ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; # These fixup steps are slow and unnecessary. dontPatchELF = true; diff --git a/pkgs/by-name/za/zafiro-icons/package.nix b/pkgs/by-name/za/zafiro-icons/package.nix index 27147a4c3c8c..8217a45db1ab 100644 --- a/pkgs/by-name/za/zafiro-icons/package.nix +++ b/pkgs/by-name/za/zafiro-icons/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, gtk3, - libsForQt5, + kdePackages, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - libsForQt5.breeze-icons + kdePackages.breeze-icons gnome-icon-theme numix-icon-theme numix-icon-theme-circle @@ -38,6 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; dontDropIconThemeCache = true; + dontWrapQtApps = true; dontPatchELF = true; dontRewriteSymlinks = true;