diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 1b09de85bb36..a939cb5739e1 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -1,35 +1,35 @@ -{ stdenv, - lib, - fetchzip, - autoPatchelfHook, - makeWrapper, - copyDesktopItems, - makeDesktopItem, - gtk3, - openssl, - xdg-user-dirs, - keybinder3 +{ stdenv +, lib +, fetchzip +, autoPatchelfHook +, makeWrapper +, copyDesktopItems +, makeDesktopItem +, gtk3 +, openssl +, xdg-user-dirs +, keybinder3 }: stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.0.6.2"; + version = "0.0.8"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz"; - sha256 = "sha256-LOrXGFctAaiz2z9M8ghrXsQ+qygwNPyYragmL/EjlDQ="; + sha256 = "sha256-+nizRA42c0ZzuN8D/puh0TFLnRJVgyAujcTmJZ1UVzo="; }; nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - copyDesktopItems + autoPatchelfHook + makeWrapper + copyDesktopItems ]; buildInputs = [ - gtk3 - openssl - keybinder3 + gtk3 + openssl + keybinder3 ]; dontBuild = true; @@ -47,15 +47,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; - preFixup = let - binPath = lib.makeBinPath [ - xdg-user-dirs - ]; - in '' + preFixup = '' # Add missing libraries to appflowy using the ones it comes with makeWrapper $out/opt/app_flowy $out/bin/appflowy \ - --set LD_LIBRARY_PATH "$out/opt/lib/" \ - --prefix PATH : "${binPath}" + --set LD_LIBRARY_PATH "$out/opt/lib/" \ + --prefix PATH : "${lib.makeBinPath [ xdg-user-dirs ]}" ''; desktopItems = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01edbed1656..850e0eab4109 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -185,9 +185,7 @@ with pkgs; meta.platforms = lib.platforms.linux; } ../build-support/setup-hooks/auto-patchelf.sh; - appflowy = callPackage ../applications/office/appflowy { - openssl = openssl_1_1; - }; + appflowy = callPackage ../applications/office/appflowy { }; appimageTools = callPackage ../build-support/appimage { buildFHSUserEnv = buildFHSUserEnvBubblewrap;