aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules/websites
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-26 23:45:00 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-04-26 23:46:00 +0200
commit167b81657d696e91545cedde172e7859643bba06 (patch)
tree23bceb4dd1138c93beacfb3ac81fb306bb4d79da /nixops/modules/websites
parent787fcba368ae658a83b1566bcbb160f8e27ccd66 (diff)
downloadNix-167b81657d696e91545cedde172e7859643bba06.tar.gz
Nix-167b81657d696e91545cedde172e7859643bba06.tar.zst
Nix-167b81657d696e91545cedde172e7859643bba06.zip
Add yarn2nix as dependency where needed to avoid garbage collection
Diffstat (limited to 'nixops/modules/websites')
-rw-r--r--nixops/modules/websites/aten/aten.nix3
-rw-r--r--nixops/modules/websites/tools/mastodon/mastodon.nix3
2 files changed, 6 insertions, 0 deletions
diff --git a/nixops/modules/websites/aten/aten.nix b/nixops/modules/websites/aten/aten.nix
index 46a7361..c35af6f 100644
--- a/nixops/modules/websites/aten/aten.nix
+++ b/nixops/modules/websites/aten/aten.nix
@@ -117,6 +117,9 @@ let
117 packageJSON = packagejson; 117 packageJSON = packagejson;
118 yarnLock = "${info.src}/yarn.lock"; 118 yarnLock = "${info.src}/yarn.lock";
119 pkgConfig = { 119 pkgConfig = {
120 all = {
121 buildInputs = [ yarn2nixPackage.src ];
122 };
120 node-sass = { 123 node-sass = {
121 buildInputs = [ libsass python ]; 124 buildInputs = [ libsass python ];
122 postInstall = let 125 postInstall = let
diff --git a/nixops/modules/websites/tools/mastodon/mastodon.nix b/nixops/modules/websites/tools/mastodon/mastodon.nix
index 3ee3552..516cc58 100644
--- a/nixops/modules/websites/tools/mastodon/mastodon.nix
+++ b/nixops/modules/websites/tools/mastodon/mastodon.nix
@@ -44,6 +44,9 @@ let
44 yarnLock = "${info.src}/yarn.lock"; 44 yarnLock = "${info.src}/yarn.lock";
45 yarnNix = ./yarn-packages.nix; 45 yarnNix = ./yarn-packages.nix;
46 pkgConfig = { 46 pkgConfig = {
47 all = {
48 buildInputs = [ yarn2nixPackage.src ];
49 };
47 uws = { 50 uws = {
48 postInstall = '' 51 postInstall = ''
49 npx node-gyp rebuild > build_log.txt 2>&1 || true 52 npx node-gyp rebuild > build_log.txt 2>&1 || true