diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index a696ab541280..90df4c1342f5 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -5,20 +5,19 @@ , ninja , wrapGAppsHook3 , makeWrapper -, wxGTK -, Cocoa +, wxGTK32 , unstableGitUpdater }: 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 = [ @@ -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 fb418e73c0b0..61099a332e7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15843,10 +15843,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 { };