diff options
Diffstat (limited to 'nixops/modules/websites')
-rw-r--r-- | nixops/modules/websites/aten/aten.nix | 3 | ||||
-rw-r--r-- | nixops/modules/websites/tools/mastodon/mastodon.nix | 3 |
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 |