From a923c6407996108af3a76c5aeb29d3b5926981b1 Mon Sep 17 00:00:00 2001
From: ZHAO Jin-Xiang <xiaoxiangmoe@gmail.com>
Date: Thu, 26 Dec 2024 23:04:34 +0800
Subject: [PATCH] affine: fix build

---
 pkgs/by-name/af/affine/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix
index 1fb002189e08..5b6e9caa9e79 100644
--- a/pkgs/by-name/af/affine/package.nix
+++ b/pkgs/by-name/af/affine/package.nix
@@ -2,7 +2,6 @@
   cacert,
   cargo,
   copyDesktopItems,
-  electron_33,
   fetchFromGitHub,
   fetchurl,
   findutils,
@@ -10,14 +9,15 @@
   lib,
   makeDesktopItem,
   makeWrapper,
-  nodejs_20,
   rsync,
   rustPlatform,
   rustc,
   stdenv,
   stdenvNoCC,
-  yarn,
+  yarn-berry,
   zip,
+  electron_33,
+  nodejs_20,
   buildType ? "stable",
   commandLineArgs ? "",
 }:
@@ -32,6 +32,8 @@ let
     .${hostPlatform.parsed.cpu.name}
       or (throw "affine(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}");
   electron = electron_33;
+  nodejs = nodejs_20;
+  yarn = yarn-berry.override { inherit nodejs; };
 in
 stdenv.mkDerivation (
   finalAttrs:
@@ -121,7 +123,7 @@ stdenv.mkDerivation (
       };
       nativeBuildInputs =
         [
-          nodejs_20
+          nodejs
           yarn
           cargo
           rustc