diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-29 19:26:19 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-29 19:26:19 +0100 |
commit | 24a7da33965001415edb022245b289bb5fc49a07 (patch) | |
tree | ddd0b95fc2e6c269b15ab49725f69d93b550ae29 /nixops/modules/websites/aten | |
parent | 79f239be693bb2bad9e1cc64a32e874d96cc4cf7 (diff) | |
download | Nix-24a7da33965001415edb022245b289bb5fc49a07.tar.gz Nix-24a7da33965001415edb022245b289bb5fc49a07.tar.zst Nix-24a7da33965001415edb022245b289bb5fc49a07.zip |
Remove reference to ar coming from busybox sh
Diffstat (limited to 'nixops/modules/websites/aten')
-rw-r--r-- | nixops/modules/websites/aten/aten.nix | 5 |
1 files changed, 2 insertions, 3 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 | }; |