From b11061581dba23674d65789b737816cc53017d38 Mon Sep 17 00:00:00 2001
From: Dovydas Kersys <dovydas@kersys.lt>
Date: Sat, 24 Aug 2024 00:59:39 +0300
Subject: [PATCH 1/3] apple-cursor: 2.0.0 -> 2.0.1

---
 pkgs/data/icons/apple-cursor/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/data/icons/apple-cursor/default.nix
index 5db50d0fbbe8..b8bc15a2bf57 100644
--- a/pkgs/data/icons/apple-cursor/default.nix
+++ b/pkgs/data/icons/apple-cursor/default.nix
@@ -8,19 +8,12 @@ let
     name = variant;
     url = "https://github.com/ful1e5/apple_cursor/releases/download/v${version}/${variant}.${suffix}";
     hash = hash;
-  } // (lib.optionalAttrs (suffix == "zip") { stripRoot = false; }));
+  } // (lib.optionalAttrs (suffix == "zip") { stripRoot = false; }) // (lib.optionalAttrs (suffix == "tar.xz") { stripRoot = false; }));
 
-  version = "2.0.0";
   srcs = [
-    (_src "macOS-BigSur-White" "tar.gz" "sha256-3Ax2hMfkEL4cyJtGQpK3PqC/L5wtmgO0LsY4gkTQ2Bg=")
-    (_src "macOS-BigSur-White-Windows" "zip" "sha256-V6J2Ddgq46BkgxCWVReZrvE7CsOczzV7slOpilKFG9E=")
-    (_src "macOS-BigSur" "tar.gz" "sha256-VZWFf1AHum2xDJPMZrBmcyVrrmYGKwCdXOPATw7myOA=")
-    (_src "macOS-BigSur-Windows" "zip" "sha256-lp28ACsK8BXe6rSDELL4GdXb1QEdOVC8Y6eLofctkR4=")
-    (_src "macOS-Monterey-White" "tar.gz" "sha256-IfFYUbDW6mBe209iU1sBhFzolZd6YDVdJf+DPe9AQDM=")
-    (_src "macOS-Monterey-White-Windows" "zip" "sha256-gUuBFOi0nDBoX9TWPg4eQhCAhwYeEhfDEbYpc+XsQNE=")
-    (_src "macOS-Monterey" "tar.gz" "sha256-MHmaZs56Q1NbjkecvfcG1zAW85BCZDn5kXmxqVzPc7M=")
-    (_src "macOS-Monterey-Windows" "zip" "sha256-ajxEgq7besaRajLn0gTPpp4euOWVqbzc78u720PWlyE=")
+    (_src "macOS" "tar.xz" "sha256-nS4g+VwM+4q/S1ODb3ySi2SBk7Ha8vF8d9XpP5cEkok=")
   ];
+  version = "2.0.1";
 in stdenv.mkDerivation rec {
   pname = "apple_cursor";
   inherit version;
@@ -30,7 +23,7 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     install -dm 0755 $out/share/icons
-    cp -r macOS* $out/share/icons/
+    cp -r macOS/macOS* $out/share/icons/
   '';
 
   meta = with lib; {

From a20c12ad89b45e3585fcbfe1eed767cf252c0766 Mon Sep 17 00:00:00 2001
From: Dovydas Kersys <dovydas@kersys.lt>
Date: Sat, 24 Aug 2024 01:12:07 +0300
Subject: [PATCH 2/3] maintainers: add dxwil

---
 maintainers/maintainer-list.nix          | 6 ++++++
 pkgs/data/icons/apple-cursor/default.nix | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 349b6d2a9f3f..9ca35626562f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5630,6 +5630,12 @@
     githubId = 6689924;
     name = "David Terry";
   };
+  dxwil = {
+    email = "dovydas@kersys.lt";
+    github = "dxwil";
+    githubId = 90563298;
+    name = "Dovydas Kersys";
+  };
   dylan-gonzalez = {
     email = "dylcg10@gmail.com";
     github = "dylan-gonzalez";
diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/data/icons/apple-cursor/default.nix
index b8bc15a2bf57..81643854fc42 100644
--- a/pkgs/data/icons/apple-cursor/default.nix
+++ b/pkgs/data/icons/apple-cursor/default.nix
@@ -31,6 +31,6 @@ in stdenv.mkDerivation rec {
     homepage = "https://github.com/ful1e5/apple_cursor";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ colemickens ];
+    maintainers = with maintainers; [ colemickens dxwil ];
   };
 }

From 3043a60eabefcaee1a587c240d718d49ebb38156 Mon Sep 17 00:00:00 2001
From: Dovydas Kersys <dovydas@kersys.lt>
Date: Mon, 2 Sep 2024 17:10:39 +0200
Subject: [PATCH 3/3] apple-cursor: modify license

---
 pkgs/data/icons/apple-cursor/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/data/icons/apple-cursor/default.nix
index 81643854fc42..6f33219ed6c5 100644
--- a/pkgs/data/icons/apple-cursor/default.nix
+++ b/pkgs/data/icons/apple-cursor/default.nix
@@ -29,7 +29,12 @@ in stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Opensource macOS Cursors";
     homepage = "https://github.com/ful1e5/apple_cursor";
-    license = licenses.gpl3;
+    license = [
+      licenses.gpl3Only
+    
+      # Potentially a derivative work of copyrighted Apple designs
+      licenses.unfree
+    ];
     platforms = platforms.linux;
     maintainers = with maintainers; [ colemickens dxwil ];
   };