From 70f70049999dced622574b89aaf6f9abd920d75e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 1 Aug 2025 13:46:29 +0000
Subject: [PATCH] zafiro-icons: migrate to by-name and switch to libsForQt5

---
 .../za/zafiro-icons/package.nix}              | 22 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 11 insertions(+), 15 deletions(-)
 rename pkgs/{data/icons/zafiro-icons/default.nix => by-name/za/zafiro-icons/package.nix} (79%)

diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/by-name/za/zafiro-icons/package.nix
similarity index 79%
rename from pkgs/data/icons/zafiro-icons/default.nix
rename to pkgs/by-name/za/zafiro-icons/package.nix
index 44858afeb9e3..27147a4c3c8c 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/by-name/za/zafiro-icons/package.nix
@@ -3,7 +3,7 @@
   stdenvNoCC,
   fetchFromGitHub,
   gtk3,
-  breeze-icons,
+  libsForQt5,
   gnome-icon-theme,
   numix-icon-theme,
   numix-icon-theme-circle,
@@ -12,15 +12,15 @@
   gitUpdater,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zafiro-icons";
   version = "1.3";
 
   src = fetchFromGitHub {
     owner = "zayronxio";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-IbFnlUOSADYMNMfvRuRPndxcQbnV12BqMDb9bJRjnoU=";
+    repo = "zafiro-icons";
+    tag = finalAttrs.version;
+    hash = "sha256-IbFnlUOSADYMNMfvRuRPndxcQbnV12BqMDb9bJRjnoU=";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    breeze-icons
+    libsForQt5.breeze-icons
     gnome-icon-theme
     numix-icon-theme
     numix-icon-theme-circle
@@ -67,11 +67,11 @@ stdenvNoCC.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Icon pack flat with light colors";
     homepage = "https://github.com/zayronxio/Zafiro-icons";
-    license = with licenses; [ gpl3 ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ romildo ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f4de0910ec4..900f4a33fedd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11637,10 +11637,6 @@ with pkgs;
 
   xlsx2csv = with python3Packages; toPythonApplication xlsx2csv;
 
-  zafiro-icons = callPackage ../data/icons/zafiro-icons {
-    inherit (plasma5Packages) breeze-icons;
-  };
-
   zeal-qt5 = libsForQt5.callPackage ../data/documentation/zeal { };
   zeal = zeal-qt5;
   zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal {