From ba307dd1765df1c611e63422863651bbe540e592 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 22 Nov 2019 23:41:13 +0100 Subject: codimd: fix build This package broke during the update of `nodejs-10_x` to `v10.17.0`[1] since `node-gyp` got updated from `3.8.0` to `5.0.3` during the NPM update to `6.10.2`[2] which is bundled in the `nodejs` release tarball. This `node-gyp`-version is used by the build script for `codimd` to build several dependencies such as `node-sqlite3`. Older `node-gyp` versions expected source headers for the compilation in `~/.node-gyp`, with `node-gyp@5.0.3`, headers are declared by using the `--nodedir` option. [1] 7785f49b23c197ec4a02ee409b4643fa0b42b3bb [2] https://github.com/nodejs/node/commit/e2291cf805c1dd4202367088d63e0a12a4f6e9fd --- pkgs/servers/web-apps/codimd/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'pkgs/servers/web-apps') diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix index ab4065597ae2..77aca0f8e196 100644 --- a/pkgs/servers/web-apps/codimd/default.nix +++ b/pkgs/servers/web-apps/codimd/default.nix @@ -35,14 +35,8 @@ yarn2nix.mkYarnPackage rec { popd pushd node_modules/sqlite3 - export OLD_HOME="$HOME" - export HOME="$PWD" - mkdir -p .node-gyp/${nodejs.version} - echo 9 > .node-gyp/${nodejs.version}/installVersion - ln -s ${nodejs}/include .node-gyp/${nodejs.version} - npm run install - export HOME="$OLD_HOME" - unset OLD_HOME + export CPPFLAGS="-I${nodejs}/include/node" + npm run install --build-from-source --nodedir=${nodejs}/include/node popd npm run build -- cgit 1.4.1