From dccfc28ce9bb1603335678696677faefab3229ca Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Sat, 2 Nov 2024 15:43:43 +0100 Subject: [PATCH] appflowy: fix broken macos install phase - unzip the nested archive - format with nixfmt --- pkgs/applications/office/appflowy/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 3c752cd74b98cc..ed142eb48b153e 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -10,6 +10,7 @@ xdg-user-dirs, keybinder3, libnotify, + unzip, }: let @@ -38,10 +39,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { stripRoot = false; }; - nativeBuildInputs = [ - makeWrapper - copyDesktopItems - ] ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = + [ + makeWrapper + copyDesktopItems + ] + ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ] + ++ lib.optionals stdenvNoCC.hostPlatform.isDarwin [ unzip ]; buildInputs = [ gtk3 @@ -71,6 +75,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' runHook preInstall + unzip AppFlowy-${finalAttrs.version}-${dist.urlSuffix} + mkdir -p $out/{Applications,bin} cp -r ./AppFlowy.app $out/Applications/