From 26fcc4fb243a7e7e2f872e889f75ca95e2375fd3 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 31 May 2025 21:26:19 +0300 Subject: [PATCH] feat(flake): support darwin --- flake.nix | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index a2dd0197b..4ffa16168 100644 --- a/flake.nix +++ b/flake.nix @@ -27,23 +27,35 @@ pnpm stdenv wrapGAppsHook3 + xcodebuild + darwin ; desktop = stdenv.mkDerivation (finalAttrs: { pname = "triliumnext-desktop"; version = packageJSON.version; src = lib.cleanSource ./.; - nativeBuildInputs = [ - pnpm.configHook - nodejs - nodejs.python - copyDesktopItems - makeBinaryWrapper - wrapGAppsHook3 - ]; + nativeBuildInputs = + [ + pnpm.configHook + nodejs + nodejs.python + copyDesktopItems + makeBinaryWrapper + wrapGAppsHook3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + xcodebuild + darwin.cctools + ]; dontWrapGApps = true; + preBuild = lib.optionalString stdenv.hostPlatform.isLinux '' + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + node_modules/.pnpm/sass-embedded-linux-x64@*/node_modules/sass-embedded-linux-x64/dart-sass/src/dart + ''; + buildPhase = '' runHook preBuild @@ -51,8 +63,6 @@ export NX_TUI=false export NX_DAEMON=false - patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - node_modules/.pnpm/sass-embedded-linux-x64@*/node_modules/sass-embedded-linux-x64/dart-sass/src/dart pnpm nx run desktop:build --outputStyle stream --verbose # Rebuild dependencies