Clean up and fully fix the build #4

Manually merged
tlater merged 6 commits from tlater/fix-build into master 2021-04-11 06:03:34 +01:00
2 changed files with 9 additions and 3 deletions
Showing only changes of commit 75e60a40d4 - Show all commits

View file

@ -42,7 +42,8 @@
devShell = prev.mkShell {
buildInputs = with prev;
with nodePackages; [
with nodePackages;
[
nodejs
node2nix
@ -50,7 +51,7 @@
prettier
typescript
typescript-language-server
];
] ++ packages.nodeEnv.shell.buildInputs;
};
};
};

View file

@ -6,9 +6,14 @@ in nodePackages // {
shell = nodePackages.shell.override {
buildInputs = with pkgs; [
pkgs.nodePackages.node-gyp-build
pkgconfig
# For sharp (dependency of the auto-favicon
# generator). This depends on the vips (which uses
# gobjects), and builds using node-gyp, which in turn
# needs python.
vips
glib
pkgconfig
];
npmFlags = "--ignore-scripts";