From 84ca7ad13628b81a2063fa2b5d8e924b3b3dd3f9 Mon Sep 17 00:00:00 2001
From: jaina heartles <me@heartles.xyz>
Date: Mon, 26 Feb 2024 09:51:53 -0800
Subject: [PATCH] fix service pnpm

---
 misskey-service.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/misskey-service.nix b/misskey-service.nix
index 655ca55..9f20457 100644
--- a/misskey-service.nix
+++ b/misskey-service.nix
@@ -1,4 +1,9 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+
+let
+  nodejs = pkgs.unstable.nodejs_20;
+  nodePackages = (pkgs.nodePackages.override { nodejs = nodejs; });
+in {
   services.postgresql = {
     enable = true;
     package = pkgs.postgresql_15;
@@ -106,14 +111,8 @@
   # todo: figure out how to get misskey to build in nix instead of requiring a manual build process
   #
   # pnpm2nix does not work due to misskey using workspaces
-  environment.systemPackages = let nodejs = pkgs.unstable.nodejs_20;
-  in with pkgs; [
-    (nodePackages.override { inherit nodejs; }).pnpm
-    nodejs
-    cypress
-    pkg-config
-    vips
-  ];
+  environment.systemPackages =
+    [ nodejs nodePackages.pnpm pkgs.cypress pkgs.pkg-config pkgs.vips ];
   environment.sessionVariables = {
     CYPRESS_INSTALL_BINARY = "0";
     CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
@@ -130,7 +129,7 @@
       Environment = "NODE_ENV=production";
       WorkingDirectory = "/srv/misskey";
       User = "misskey";
-      ExecStart = "pnpm migrateandrun";
+      ExecStart = "${nodePackages.pnpm}/bin/pnpm migrateandrun";
       RuntimeDirectory = "misskey";
     };