From 6e1f5c99af739a2017ff8145c7e905f49374d29f Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sat, 9 Nov 2024 20:04:01 -0800
Subject: [PATCH 1/3] neovide: add missing cctools.libtool dependency

---
 pkgs/by-name/ne/neovide/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index dc49789cf5df..e6e3c242154c 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -12,6 +12,7 @@
 , pkg-config
 , python3
 , removeReferencesTo
+, cctools
 , xcbuild
 , SDL2
 , fontconfig
@@ -62,6 +63,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
   SKIA_NINJA_COMMAND = "${ninja}/bin/ninja";
 
   nativeBuildInputs = [
+    cctools.libtool
     makeWrapper
     pkg-config
     python3 # skia

From b06408517613470b767cd6941c1f59635d78e154 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sat, 9 Nov 2024 20:05:23 -0800
Subject: [PATCH 2/3] neovide: use new Darwin SDK pattern

---
 pkgs/by-name/ne/neovide/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index e6e3c242154c..15c1d4ca7dbe 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -13,12 +13,10 @@
 , python3
 , removeReferencesTo
 , cctools
-, xcbuild
 , SDL2
 , fontconfig
 , xorg
 , stdenv
-, darwin
 , libglvnd
 , libxkbcommon
 , enableWayland ? stdenv.hostPlatform.isLinux
@@ -68,7 +66,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
     pkg-config
     python3 # skia
     removeReferencesTo
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+  ];
 
   nativeCheckInputs = [ neovim ];
 
@@ -76,8 +74,6 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
     SDL2
     fontconfig
     rustPlatform.bindgenHook
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.AppKit
   ];
 
   postFixup = let

From 4e6fffab80904902cb57928228738c5e96a2e215 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sat, 9 Nov 2024 20:21:29 -0800
Subject: [PATCH 3/3] neovide: unbreak on x86_64-darwin by using 11.3 SDK

---
 pkgs/by-name/ne/neovide/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index 15c1d4ca7dbe..d23f77669caa 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -12,6 +12,7 @@
 , pkg-config
 , python3
 , removeReferencesTo
+, apple-sdk_11
 , cctools
 , SDL2
 , fontconfig
@@ -74,7 +75,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
     SDL2
     fontconfig
     rustPlatform.bindgenHook
-  ];
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
 
   postFixup = let
     libPath = lib.makeLibraryPath ([
@@ -116,6 +117,6 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
     changelog = "https://github.com/neovide/neovide/releases/tag/${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ ck3d ];
-    platforms = platforms.linux ++ [ "aarch64-darwin" ];
+    platforms = platforms.unix;
   };
 }