From 3f318e99f1b9f86173692ec18a24e13bdbab85df Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 7 Jun 2026 16:24:50 +0200
Subject: [PATCH] pnpm-fixup-state-db: make it depend on `nodejs-slim`

---
 .../build-support/node/fetch-pnpm-deps/default.nix | 14 +-------------
 pkgs/by-name/pn/pnpm-fixup-state-db/package.nix    |  7 ++++---
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
index 68b8836887c6..4669d4909b7f 100644
--- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix
@@ -52,19 +52,7 @@ in
       pnpm-fixup-state-db' =
         if pnpm.nodejs-slim or null != null then
           pnpm-fixup-state-db.override {
-            # FIXME: make npm-config-hook accept nodejs-slim
-            nodejs =
-              let
-                inherit (pnpm) nodejs-slim;
-              in
-              if nodejs-slim ? paths && builtins.isList nodejs-slim.paths then
-                # If nodejs-slim has a list `paths` attribute, it's likely a simlinkJoin
-                nodejs-slim
-              else
-                # Otherwise we need to recreate one by overriding the default one
-                pnpm-fixup-state-db.nodejs.override {
-                  inherit nodejs-slim;
-                };
+            inherit (pnpm) nodejs-slim;
           }
         else
           pnpm-fixup-state-db;
diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix b/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix
index 66c5da928e16..2bfc32c31d73 100644
--- a/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix
+++ b/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix
@@ -1,7 +1,7 @@
 {
   buildNpmPackage,
   lib,
-  nodejs,
+  nodejs-slim,
   pnpm,
   tests,
 }:
@@ -11,12 +11,13 @@ buildNpmPackage {
 
   src = ./src;
 
-  inherit nodejs;
+  nodejs = nodejs-slim;
+  nativeBuildInputs = lib.optional (builtins.hasAttr "npm" nodejs-slim) nodejs-slim.npm;
 
   npmDepsHash = "sha256-um6a4pEtPtdxHBRq9g5ZW20wIQAMjWJ3qF96XuxJg8o=";
 
   postInstall = ''
-    makeWrapper ${lib.getExe nodejs} $out/bin/pnpm-fixup-state-db \
+    makeWrapper ${lib.getExe nodejs-slim} $out/bin/pnpm-fixup-state-db \
       --add-flags "$out/lib/node_modules/pnpm-fixup-state-db"
   '';