fix(flake.nix): fix site build & add missing inputs for darwin hosts

ThomasK33 · ThomasK33 · commit 8c0a26242650 · 2025-01-15T17:34:09.000+01:00
Change-Id: I28f0e301298806f251121cc93224740bcc02bcba
Signed-off-by: Thomas Kosiewski &lt;tk@coder.com&gt;
diff --git a/flake.nix b/flake.nix
@@ -32,7 +32,7 @@
           inherit system;
         };
 
-        nodejs = pkgs.nodejs-18_x;
+        nodejs = pkgs.nodejs_20;
         # Check in https://search.nixos.org/packages to find new packages.
         # Use `nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update`
         # to update the lock file if packages are out-of-date.
@@ -88,6 +88,7 @@
           less
           mockgen
           moreutils
+          nix-prefetch-git
           nfpm
           nodejs
           neovim
@@ -119,9 +120,17 @@
 
         # buildSite packages the site directory.
         buildSite = pnpm2nix.packages.${system}.mkPnpmPackage {
+          inherit nodejs;
+
           src = ./site/.;
           # Required for the `canvas` package!
-          extraBuildInputs = with pkgs; [ pkgs.cairo pkgs.pango pkgs.pixman ];
+          extraBuildInputs = with pkgs; [
+            cairo
+            pango
+            pixman
+            libpng libjpeg giflib librsvg
+            python312Packages.setuptools
+          ] ++ ( lib.optionals stdenv.targetPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation xcbuild ] );
           installInPlace = true;
           distDir = "out";
         };
@@ -161,15 +170,18 @@
           };
       in
       {
-        devShell = pkgs.mkShell {
-          buildInputs = devShellPackages;
-          shellHook = ''
-            export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright-driver.browsers}
-            export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true
-          '';
-
-          LOCALE_ARCHIVE = with pkgs; lib.optionalDrvAttr stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
+        devShells = {
+          default = pkgs.mkShell {
+            buildInputs = devShellPackages;
+            shellHook = ''
+              export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright-driver.browsers}
+              export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true
+            '';
+
+            LOCALE_ARCHIVE = with pkgs; lib.optionalDrvAttr stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
+          };
         };
+
         packages = {
           proto_gen_go = proto_gen_go_1_30;
           all = pkgs.buildEnv {
diff --git a/site/.npmrc b/site/.npmrc
@@ -1,2 +1,5 @@
 save-exact=true
 engine-strict=true
+
+# Needed for nix builds of the site; see: https://github.com/nzbr/pnpm2nix-nzbr/issues/33#issuecomment-2381628294
+lockfile-include-tarball-url=true
diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml
