mirror of
https://github.com/chatmail/core.git
synced 2026-05-02 12:56:30 +03:00
Revert "WIP npm2nix, error: no source/nix"
This reverts commit 83bfba53de.
This commit is contained in:
committed by
missytake
parent
0ae831eca0
commit
ba2bb517f7
27
flake.nix
27
flake.nix
@@ -21,9 +21,6 @@
|
|||||||
inherit (sdkPkgs) ndk-24-0-8215888 cmdline-tools-latest;
|
inherit (sdkPkgs) ndk-24-0-8215888 cmdline-tools-latest;
|
||||||
});
|
});
|
||||||
androidNdkRoot = "${androidSdk}/share/android-sdk/ndk/24.0.8215888";
|
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 {
|
rustSrc = nix-filter.lib {
|
||||||
root = ./.;
|
root = ./.;
|
||||||
@@ -530,24 +527,12 @@
|
|||||||
pname = "docs";
|
pname = "docs";
|
||||||
version = manifest.version;
|
version = manifest.version;
|
||||||
src = pkgs.lib.cleanSource ./.;
|
src = pkgs.lib.cleanSource ./.;
|
||||||
buildInputs = [ nodejs ];
|
nativeBuildInputs = [
|
||||||
nativeBuildInputs = [ pkgs.nodePackages.node2nix ];
|
pkgs.nodejs_21
|
||||||
buildPhase = ''
|
];
|
||||||
node2nix -21 --development \
|
buildPhase = "npm i && npm run docs";
|
||||||
--input package.json \
|
installPhase =
|
||||||
--lock package-lock.json \
|
"mkdir -p $out; cp -av deltachat-jsonrpc/typescript/docs $out";
|
||||||
--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
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user