Skip to content

add nodePackages vega-cli and vega-lite #97908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doronbehar merged 4 commits into from
Sep 19, 2020
Merged

add nodePackages vega-cli and vega-lite #97908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e192fe6
maintainer: add mmesch
MMesch Sep 14, 2020
233331c
nodePackages.vega-cli: init at version 5.15.0
MMesch Sep 13, 2020
7fb1ee0
nodePackages.vega-lite: init at version 4.15.0
MMesch Sep 13, 2020
9c12892
joplin: fix build by adding missing deps
doronbehar Sep 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5709,6 +5709,12 @@
githubId = 117842;
name = "Henri Bourcereau";
};
mmesch = {
email = "mmesch@noreply.github.com";
github = "mmesch";
githubId = 2597803;
name = "Matthias Meschede";
};
mmilata = {
email = "martin@martinmilata.cz";
github = "mmilata";
Expand Down
28 changes: 28 additions & 0 deletions pkgs/development/node-packages/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,32 @@ let
meta.broken = since "10";
};

vega-cli = super.vega-cli.override {
nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = with pkgs; [
super.node-pre-gyp
pixman
cairo
pango
libjpeg
];
};

vega-lite = super.vega-lite.override {
# npx tries to install vega from scratch at vegalite runtime if it
# can't find it. We thus replace it with a direct call to the nix
# derivation. This might not be necessary anymore in future vl
# versions: https://github.com/vega/vega-lite/issues/6863.
postInstall = ''
substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2pdf \
--replace "npx -p vega vg2pdf" "${self.vega-cli}/bin/vg2pdf"
substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2svg \
--replace "npx -p vega vg2svg" "${self.vega-cli}/bin/vg2svg"
substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2png \
--replace "npx -p vega vg2png" "${self.vega-cli}/bin/vg2png"
'';
};

webtorrent-cli = super.webtorrent-cli.override {
buildInputs = [ self.node-gyp-build ];
};
Expand All @@ -181,6 +207,8 @@ let
# https://sharp.pixelplumbing.com/install
vips

libsecret
self.node-gyp-build
self.node-pre-gyp
];
};
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/node-packages/node-packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@
, "typescript-language-server"
, "uglify-js"
, "ungit"
, "vega-cli"
, "vega-lite"
, "vim-language-server"
, "vscode-css-languageserver-bin"
, "vscode-html-languageserver-bin"
Expand Down
Loading