From ba2bb517f7d31b7a7f6dba83a476005d355ba8ce Mon Sep 17 00:00:00 2001
From: Christian Hagenest <mail@hagenest.dev>
Date: Thu, 25 Apr 2024 20:52:48 +0200
Subject: [PATCH] Revert "WIP npm2nix, error: no source/nix"

This reverts commit 83bfba53de669a448c41a1ed507ea97f23a4c2a7.
---
 flake.nix | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/flake.nix b/flake.nix
index c512cbbeb..34dcf726b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,9 +21,6 @@
             inherit (sdkPkgs) ndk-24-0-8215888 cmdline-tools-latest;
           });
         androidNdkRoot = "${androidSdk}/share/android-sdk/ndk/24.0.8215888";
-        nodejs = pkgs.nodejs_21;
-        node2nixOutput = import ./nix { inherit pkgs nodejs system; };
-        nodeDeps = node2nixOutput.nodeDependencies;
 
         rustSrc = nix-filter.lib {
           root = ./.;
@@ -526,28 +523,16 @@
                 buildPhase = ''sphinx-build -b html -a python/doc/ dist/html'';
                 installPhase = ''mkdir -p $out; cp -av dist/html $out'';
               };
-            jsonrpc-docs = pkgs.stdenv.mkDerivation {
-              pname = "docs";
-              version = manifest.version;
-              src = pkgs.lib.cleanSource ./.;
-              buildInputs = [ nodejs ];
-              nativeBuildInputs = [ pkgs.nodePackages.node2nix ];
-              buildPhase = ''
-                node2nix -21 --development \
-                  --input package.json \
-                  --lock package-lock.json \
-                  --node-env ./nix/node-env.nix \
-                  --composition ./nix/default.nix \
-                  --output ./nix/node-package.nix
-                nodeDeps=$(nix-build ./nix/default.nix -A nodeDependencies)
-                ln -sf ${nodeDeps}/lib/node_modules ./node_modules
-                export PATH="${nodeDeps}/bin:$PATH"
-                npm i && npm run docs
-              '';
-              installPhase = ''
-                mkdir -p $out
-                cp -av dist/html $out
-              '';
+              jsonrpc-docs = pkgs.stdenv.mkDerivation {
+                pname = "docs";
+                version = manifest.version;
+                src = pkgs.lib.cleanSource ./.;
+                nativeBuildInputs = [
+                  pkgs.nodejs_21
+                ];
+                buildPhase = "npm i && npm run docs";
+                installPhase =
+                  "mkdir -p $out; cp -av deltachat-jsonrpc/typescript/docs $out";
               };
           };