diff options
Diffstat (limited to 'nixops')
-rw-r--r-- | nixops/modules/websites/aten/aten.nix | 5 | ||||
-rw-r--r-- | nixops/modules/websites/tools/mastodon/mastodon.nix | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/nixops/modules/websites/aten/aten.nix b/nixops/modules/websites/aten/aten.nix index 69e1d4c..715f689 100644 --- a/nixops/modules/websites/aten/aten.nix +++ b/nixops/modules/websites/aten/aten.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, writeText, fetchedGitPrivate, stdenv, composerEnv, fetchurl, fetchgit, binutils, python, nodejs, libsass, yarn2nix }: | 1 | { lib, writeText, fetchedGitPrivate, stdenv, composerEnv, fetchurl, fetchgit, python, nodejs, libsass, yarn2nix }: |
2 | let | 2 | let |
3 | aten = { config }: rec { | 3 | aten = { config }: rec { |
4 | environment = config.environment; | 4 | environment = config.environment; |
@@ -96,7 +96,7 @@ let | |||
96 | yarnLock = "${info.src}/yarn.lock"; | 96 | yarnLock = "${info.src}/yarn.lock"; |
97 | pkgConfig = { | 97 | pkgConfig = { |
98 | node-sass = { | 98 | node-sass = { |
99 | buildInputs = [ binutils libsass python ]; | 99 | buildInputs = [ libsass python ]; |
100 | postInstall = let | 100 | postInstall = let |
101 | nodeHeaders = fetchurl { | 101 | nodeHeaders = fetchurl { |
102 | url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; | 102 | url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; |
@@ -104,7 +104,6 @@ let | |||
104 | }; | 104 | }; |
105 | in | 105 | in |
106 | '' | 106 | '' |
107 | export AR=${binutils.bintools}/bin/ar | ||
108 | node scripts/build.js --tarball=${nodeHeaders} | 107 | node scripts/build.js --tarball=${nodeHeaders} |
109 | ''; | 108 | ''; |
110 | }; | 109 | }; |
diff --git a/nixops/modules/websites/tools/mastodon/mastodon.nix b/nixops/modules/websites/tools/mastodon/mastodon.nix index 8650ee3..ae2a3f6 100644 --- a/nixops/modules/websites/tools/mastodon/mastodon.nix +++ b/nixops/modules/websites/tools/mastodon/mastodon.nix | |||
@@ -42,7 +42,7 @@ let | |||
42 | buildInputs = with pkgs; [ nodePackages.node-pre-gyp ]; | 42 | buildInputs = with pkgs; [ nodePackages.node-pre-gyp ]; |
43 | }; | 43 | }; |
44 | node-sass = { | 44 | node-sass = { |
45 | buildInputs = with pkgs; [ binutils libsass python ]; | 45 | buildInputs = with pkgs; [ libsass python ]; |
46 | postInstall = let | 46 | postInstall = let |
47 | nodeHeaders = pkgs.fetchurl { | 47 | nodeHeaders = pkgs.fetchurl { |
48 | url = "https://nodejs.org/download/release/v${pkgs.nodejs.version}/node-v${pkgs.nodejs.version}-headers.tar.gz"; | 48 | url = "https://nodejs.org/download/release/v${pkgs.nodejs.version}/node-v${pkgs.nodejs.version}-headers.tar.gz"; |
@@ -50,7 +50,6 @@ let | |||
50 | }; | 50 | }; |
51 | in | 51 | in |
52 | '' | 52 | '' |
53 | export AR=${pkgs.binutils.bintools}/bin/ar | ||
54 | node scripts/build.js --tarball=${nodeHeaders} | 53 | node scripts/build.js --tarball=${nodeHeaders} |
55 | ''; | 54 | ''; |
56 | }; | 55 | }; |