From 2359076f1f21b8efc17a8a0ceabbce37e4c703cc Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 17 Jul 2024 21:15:09 +0800
Subject: [PATCH] mint-y-icons: Move from cinnamon scope to top-level

---
 nixos/modules/services/x11/desktop-managers/cinnamon.nix      | 4 ++--
 .../default.nix => by-name/mi/mint-y-icons/package.nix}       | 0
 pkgs/desktops/cinnamon/default.nix                            | 2 +-
 pkgs/top-level/all-packages.nix                               | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename pkgs/{desktops/cinnamon/mint-y-icons/default.nix => by-name/mi/mint-y-icons/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 16a910152930..b21ee008bf20 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -70,9 +70,9 @@ in
           name = mkDefault "Mint-Y-Aqua";
           package = mkDefault pkgs.cinnamon.mint-themes;
         };
-        iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-y-icons) {
+        iconTheme = mkIf (notExcluded pkgs.mint-y-icons) {
           name = mkDefault "Mint-Y-Sand";
-          package = mkDefault pkgs.cinnamon.mint-y-icons;
+          package = mkDefault pkgs.mint-y-icons;
         };
         cursorTheme = mkIf (notExcluded pkgs.mint-cursor-themes) {
           name = mkDefault "Bibata-Modern-Classic";
diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/by-name/mi/mint-y-icons/package.nix
similarity index 100%
rename from pkgs/desktops/cinnamon/mint-y-icons/default.nix
rename to pkgs/by-name/mi/mint-y-icons/package.nix
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 124bdc154b50..6e1f99008068 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -40,7 +40,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   mint-l-icons = callPackage ./mint-l-icons { };
   mint-l-theme = callPackage ./mint-l-theme { };
   mint-themes = callPackage ./mint-themes { };
-  mint-y-icons = callPackage ./mint-y-icons { };
   muffin = callPackage ./muffin { };
   xapp = callPackage ./xapp { };
 }) // lib.optionalAttrs config.allowAliases {
@@ -50,6 +49,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   mint-artwork = lib.warn "cinnamon.mint-artwork was moved to top-level. Please use pkgs.mint-artwork directly." pkgs.mint-artwork; # Added on 2024-07-14
   mint-cursor-themes = lib.warn "cinnamon.mint-cursor-themes was moved to top-level. Please use pkgs.mint-cursor-themes directly." pkgs.mint-cursor-themes; # Added on 2024-07-14
   mint-x-icons = lib.warn "cinnamon.mint-x-icons was moved to top-level. Please use pkgs.mint-x-icons directly." pkgs.mint-x-icons; # Added on 2024-07-14
+  mint-y-icons = lib.warn "cinnamon.mint-y-icons was moved to top-level. Please use pkgs.mint-y-icons directly." pkgs.mint-y-icons; # Added on 2024-07-14
   pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14
   warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14
   xapps = pkgs.cinnamon.xapp; # added 2022-07-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f91ecb18ea3..79bfe7e5f339 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37070,7 +37070,6 @@ with pkgs;
   cdesktopenv = callPackage ../desktops/cdesktopenv { };
 
   cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });
-  inherit (cinnamon) mint-y-icons;
 
   deepin = recurseIntoAttrs (callPackage ../desktops/deepin { });