From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Tue, 29 Jan 2019 18:26:19 +0000 (+0100)
Subject: Remove reference to ar coming from busybox sh
X-Git-Tag: nur_publish~271
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=24a7da33965001415edb022245b289bb5fc49a07;hp=79f239be693bb2bad9e1cc64a32e874d96cc4cf7;p=perso%2FImmae%2FConfig%2FNix.git

Remove reference to ar coming from busybox sh
---

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 @@
-{ lib, writeText, fetchedGitPrivate, stdenv, composerEnv, fetchurl, fetchgit, binutils, python, nodejs, libsass, yarn2nix }:
+{ lib, writeText, fetchedGitPrivate, stdenv, composerEnv, fetchurl, fetchgit, python, nodejs, libsass, yarn2nix }:
 let
   aten = { config }: rec {
     environment = config.environment;
@@ -96,7 +96,7 @@ let
           yarnLock = "${info.src}/yarn.lock";
           pkgConfig = {
             node-sass = {
-              buildInputs = [ binutils libsass python ];
+              buildInputs = [ libsass python ];
               postInstall = let
                 nodeHeaders = fetchurl {
                   url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
@@ -104,7 +104,6 @@ let
                 };
               in
                 ''
-                  export AR=${binutils.bintools}/bin/ar
                   node scripts/build.js --tarball=${nodeHeaders}
                 '';
             };
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
             buildInputs = with pkgs; [ nodePackages.node-pre-gyp ];
           };
           node-sass = {
-            buildInputs = with pkgs; [ binutils libsass python ];
+            buildInputs = with pkgs; [ libsass python ];
             postInstall = let
               nodeHeaders = pkgs.fetchurl {
                 url = "https://nodejs.org/download/release/v${pkgs.nodejs.version}/node-v${pkgs.nodejs.version}-headers.tar.gz";
@@ -50,7 +50,6 @@ let
               };
             in
               ''
-                export AR=${pkgs.binutils.bintools}/bin/ar
                 node scripts/build.js --tarball=${nodeHeaders}
               '';
           };