tlaternet/tlaternet-templates
Archived
1
0
Fork 0
Code Issues 4 Pull requests Releases Wiki Activity

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
Conversation 0 Commits 6 Files changed 10 +9 -3
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 75e60a40d4 - Show all commits

5
flake.nix
View file

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

7
nix/override.nix
View file

@ -6,9 +6,14 @@ in nodePackages // {
shell = nodePackages.shell.override { shell = nodePackages.shell.override {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
pkgs.nodePackages.node-gyp-build 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 vips
glib glib
pkgconfig
]; ];
npmFlags = "--ignore-scripts"; npmFlags = "--ignore-scripts";