From 3ac4e337e1e49d95451f42847ce253d6f5c16f8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Nov 2024 09:21:04 +0000
Subject: [PATCH 1/2] treesheets: 0-unstable-2024-09-08 ->
 0-unstable-2024-11-24

---
 pkgs/applications/office/treesheets/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
index a696ab541280..a68c8772f26a 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "treesheets";
-  version = "0-unstable-2024-09-08";
+  version = "0-unstable-2024-11-24";
 
   src = fetchFromGitHub {
     owner = "aardappel";
     repo = "treesheets";
-    rev = "8db448f67710194d64211ac467ffd2d456854432";
-    hash = "sha256-SM62ymN5HXRiyXayoWQaGXLCGEDbHcKMJdPLXDv5dv8=";
+    rev = "4b27fa43bbd5db0c2a5db2a942002f71d6fdc752";
+    hash = "sha256-uKFh4sdcp6CsgJQrX6H9NQhPvOQ3U2PeS+xyDTqwkvo=";
   };
 
   nativeBuildInputs = [

From 72d4d09d23d2412125ecd3c29a31e2078fec18dd Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 6 Dec 2024 00:46:45 +0100
Subject: [PATCH 2/2] treesheets: fix darwin build

---
 pkgs/applications/office/treesheets/default.nix | 17 ++++++-----------
 pkgs/top-level/all-packages.nix                 |  5 +----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
index a68c8772f26a..90df4c1342f5 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -5,8 +5,7 @@
 , ninja
 , wrapGAppsHook3
 , makeWrapper
-, wxGTK
-, Cocoa
+, wxGTK32
 , unstableGitUpdater
 }:
 
@@ -29,19 +28,15 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    wxGTK
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Cocoa
+    wxGTK32
   ];
 
   env.NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\"";
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    shopt -s extglob
-    mkdir -p $out/{share/treesheets,bin}
-    mv $out/!(share) $out/share/treesheets
-    makeWrapper $out/{share/treesheets,bin}/treesheets \
-      --chdir $out/share/treesheets
+    mkdir -p $out/{Applications,bin}
+    mv $out/TreeSheets.app $out/Applications
+    makeWrapper $out/Applications/TreeSheets.app/Contents/MacOS/TreeSheets $out/bin/TreeSheets
   '';
 
   passthru = {
@@ -52,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Free Form Data Organizer";
-    mainProgram = "treesheets";
+    mainProgram = "TreeSheets";
 
     longDescription = ''
       The ultimate replacement for spreadsheets, mind mappers, outliners,
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e921cb61a4d6..b17e312e92f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15851,10 +15851,7 @@ with pkgs;
     wlroots = wlroots_0_18;
   };
 
-  treesheets = callPackage ../applications/office/treesheets {
-    wxGTK = wxGTK32;
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
-  };
+  treesheets = callPackage ../applications/office/treesheets { };
 
   trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };