affine: fix build

NixOS · Dec 26, 2024 · 9a899ac · 9a899ac
1 parent eb549f0
commit 9a899ac
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix
@@ -2,22 +2,22 @@
   cacert,
   cargo,
   copyDesktopItems,
-  electron_33,
   fetchFromGitHub,
   fetchurl,
   findutils,
   jq,
   lib,
   makeDesktopItem,
   makeWrapper,
-  nodejs_20,
   rsync,
   rustPlatform,
   rustc,
   stdenv,
   stdenvNoCC,
-  yarn,
+  yarn-berry,
   zip,
+  electron_33,
+  nodejs_20,
   buildType ? "stable",
   commandLineArgs ? "",
 }:
@@ -32,6 +32,7 @@ let
     .${hostPlatform.parsed.cpu.name}
       or (throw "affine(${buildType}): unsupported CPU family ${hostPlatform.parsed.cpu.name}");
   electron = electron_33;
+  nodejs = nodejs_20;
 in
 stdenv.mkDerivation (
   finalAttrs:
@@ -121,8 +122,8 @@ stdenv.mkDerivation (
       };
       nativeBuildInputs =
         [
-          nodejs_20
-          yarn
+          nodejs
+          (yarn-berry.override { inherit nodejs; })
           cargo
           rustc
           findutils