From f790b874ae61325b2f43d2170b1750398e3fcf82 Mon Sep 17 00:00:00 2001 From: Qiming Chu Date: Sat, 12 Apr 2025 01:49:28 +0800 Subject: [PATCH] affine: 0.20.5 -> 0.21.2, fix darwin build Signed-off-by: Qiming Chu --- pkgs/by-name/af/affine/package.nix | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 0628d85c49ad..b54ab0dce852 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -21,6 +21,8 @@ nix-update-script, buildType ? "stable", commandLineArgs ? "", + llvmPackages, + apple-sdk_15, }: let hostPlatform = stdenvNoCC.hostPlatform; @@ -41,17 +43,17 @@ in stdenv.mkDerivation (finalAttrs: { pname = binName; - version = "0.20.5"; + version = "0.21.2"; src = fetchFromGitHub { owner = "toeverything"; repo = "AFFiNE"; tag = "v${finalAttrs.version}"; - hash = "sha256-eMVHwjJe6u3A3Dxo6SurusRuMksp/moPmXAUv0FXBwc="; + hash = "sha256-d5dHHiiCXhzn8qJlCqJVw0qC86PvKyDZstPivX9bpCI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-Ob+A7NMTFuJ2wmRkHmemHnqkEAiY7G8NyxXXrT7NTR8="; + hash = "sha256-0vhUeqCStM7P8+sDs3ZI+JlEzPAreoP+1X8x5zKOJUo="; }; yarnOfflineCache = stdenvNoCC.mkDerivation { name = "yarn-offline-cache"; @@ -96,8 +98,13 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-e5GNWgeYw4CcpOGDd/LNk+syBupqAuws0hz+wUbaFL4="; + outputHash = "sha256-pJiMCyBJSuTaxix3kKnSCrURL2+t26zB4Y59gGdxalo="; }; + + buildInputs = lib.optionals hostPlatform.isDarwin [ + apple-sdk_15 + ]; + nativeBuildInputs = [ nodejs @@ -113,10 +120,18 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals hostPlatform.isLinux [ copyDesktopItems makeWrapper + ] + ++ lib.optionals hostPlatform.isDarwin [ + # bindgenHook is needed to build `coreaudio-sys` on darwin + rustPlatform.bindgenHook ]; - # force yarn install run in CI mode - env.CI = "1"; + env = { + # force yarn install run in CI mode + CI = "1"; + # `LIBCLANG_PATH` is needed to build `coreaudio-sys` on darwin + LIBCLANG_PATH = lib.optionalString hostPlatform.isDarwin "${lib.getLib llvmPackages.libclang}/lib"; + }; # Remove code under The AFFiNE Enterprise Edition (EE) license. # Keep file package.json for `yarn install --immutable` lockfile check.