Merge pull request #97908 from MMesch/mmesch/vega
This commit is contained in:
commit
32818fcfe9
@ -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";
|
||||
|
@ -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 ];
|
||||
};
|
||||
@ -181,6 +207,8 @@ let
|
||||
# https://sharp.pixelplumbing.com/install
|
||||
vips
|
||||
|
||||
libsecret
|
||||
self.node-gyp-build
|
||||
self.node-pre-gyp
|
||||
];
|
||||
};
|
||||
|
@ -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"
|
||||
|
935
pkgs/development/node-packages/node-packages.nix
generated
935
pkgs/development/node-packages/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user