From f68c35790ec749b72ad0607ab84cae11016fdd1e Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Sun, 20 Nov 2022 23:19:18 +0100 Subject: [PATCH 1/3] nodePackages.readability-cli: add missing build inputs for canvas module --- pkgs/development/node-packages/overrides.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index bb73049be66a..32d046d143af 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -444,6 +444,15 @@ final: prev: { ''; }; + readability-cli = prev.readability-cli.override (oldAttrs: { + nativeBuildInputs = [ pkgs.pkg-config ]; + buildInputs = with pkgs; [ + pixman + cairo + pango + ]; + }); + reveal-md = prev.reveal-md.override ( lib.optionalAttrs (!stdenv.isDarwin) { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; From ee2571e8fe2222725e74547cd898654429ae7a22 Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Sun, 20 Nov 2022 23:25:21 +0100 Subject: [PATCH 2/3] nodePackages.readability-cli: do not patch a deno shebang line --- pkgs/development/node-packages/overrides.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 32d046d143af..6b14a4612b1a 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -445,6 +445,18 @@ final: prev: { }; readability-cli = prev.readability-cli.override (oldAttrs: { + # Wrap src to fix this build error: + # > readability-cli/readable.ts: unsupported interpreter directive "#!/usr/bin/env -S deno..." + # + # Need to wrap the source, instead of patching in patchPhase, because + # buildNodePackage only unpacks sources in the installPhase. + src = stdenv.mkDerivation { + src = oldAttrs.src; + name = oldAttrs.name + "-src"; + patchPhase = "chmod a-x readable.ts"; + installPhase = ''cp -r . "$out"''; + }; + nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ pixman From dfac3e29cb489552a308dd422a84f65419d61736 Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Mon, 21 Nov 2022 09:44:20 +0100 Subject: [PATCH 3/3] nodePackages.readability-cli: use srcOnly (thanks to @marsam) --- pkgs/development/node-packages/overrides.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 6b14a4612b1a..51648536ea58 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -450,11 +450,10 @@ final: prev: { # # Need to wrap the source, instead of patching in patchPhase, because # buildNodePackage only unpacks sources in the installPhase. - src = stdenv.mkDerivation { + src = pkgs.srcOnly { src = oldAttrs.src; - name = oldAttrs.name + "-src"; + name = oldAttrs.name; patchPhase = "chmod a-x readable.ts"; - installPhase = ''cp -r . "$out"''; }; nativeBuildInputs = [ pkgs.pkg-config ];