From 4d1ca28f49b891874abe329460e3c24f606cc2bf Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 19 Mar 2024 18:11:50 +0900 Subject: joplin: fix build --- pkgs/development/node-packages/overrides.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 8ff921934ff80..a36ce3f06144c 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -112,7 +112,7 @@ final: prev: { meta = oldAttrs.meta // { license = lib.licenses.unfree; }; }); - joplin = prev.joplin.override { + joplin = prev.joplin.override (oldAttrs:{ nativeBuildInputs = [ pkgs.pkg-config ] ++ lib.optionals stdenv.isDarwin [ @@ -134,7 +134,21 @@ final: prev: { darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; - }; + + # add newer node-addon-api to build sharp + # https://github.com/lovell/sharp/issues/3920 + dependencies = [ + { + name = "node-addon-api"; + packageName = "node-addon-api"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz"; + sha512 = "mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g=="; + }; + } + ] ++ oldAttrs.dependencies; + }); jsonplaceholder = prev.jsonplaceholder.override { buildInputs = [ nodejs ]; -- cgit 1.4.1