From 1a55a2404aee5b598a16bfab6eaeb5abf8206e27 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Fri, 10 Nov 2023 12:05:24 -0500 Subject: [PATCH] [flake] Allow building on arm systems, nodejs: 18 -> 20 This also changes from the `pkgs.yarn-berry` package to the `pkgs.corepack_20` package. This allows us to use the package manager version from the package.json, negating the need to keep the nixpkgs `yarn-berry` package updated. --- flake.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 3c3517a5d..a1cffd33e 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,7 @@ # Define the systems that this works on. Only tested with x86_64-linux, add more if you test and it works. systems = [ "x86_64-linux" + "aarch64-linux" ]; # Expose these attributes for every system defined above. perSystem = { config, pkgs, ... }: { @@ -28,8 +29,8 @@ name = "iceshrimp-dev-shell"; # Add additional packages to our environment packages = [ - pkgs.yarn-berry pkgs.python3 + pkgs.corepack_20 ]; # No need to warn on a new version, we'll update as needed. devenv.warnOnNewVersion = false; @@ -37,7 +38,7 @@ languages.typescript.enable = true; # Enable javascript for NPM and Yarn languages.javascript.enable = true; - languages.javascript.package = pkgs.nodejs_18; + languages.javascript.package = pkgs.nodejs_20; processes = { dev-server.exec = "yarn run dev"; };