From 167b81657d696e91545cedde172e7859643bba06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 26 Apr 2019 23:45:00 +0200 Subject: Add yarn2nix as dependency where needed to avoid garbage collection --- nixops/modules/websites/aten/aten.nix | 3 +++ nixops/modules/websites/tools/mastodon/mastodon.nix | 3 +++ 2 files changed, 6 insertions(+) (limited to 'nixops/modules/websites') 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 packageJSON = packagejson; yarnLock = "${info.src}/yarn.lock"; pkgConfig = { + all = { + buildInputs = [ yarn2nixPackage.src ]; + }; node-sass = { buildInputs = [ libsass python ]; 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 yarnLock = "${info.src}/yarn.lock"; yarnNix = ./yarn-packages.nix; pkgConfig = { + all = { + buildInputs = [ yarn2nixPackage.src ]; + }; uws = { postInstall = '' npx node-gyp rebuild > build_log.txt 2>&1 || true -- cgit v1.2.3