]> git.immae.eu Git - perso/Immae/Config/Nix.git/commitdiff
Remove reference to ar coming from busybox sh
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Tue, 29 Jan 2019 18:26:19 +0000 (19:26 +0100)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Tue, 29 Jan 2019 18:26:19 +0000 (19:26 +0100)
nixops/modules/websites/aten/aten.nix
nixops/modules/websites/tools/mastodon/mastodon.nix

index 69e1d4c37409cee35bf0ee9cf415da9e53666aea..715f68967e16a2fe31ae1d19e2bdbdf71cc07bed 100644 (file)
@@ -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;
 let
   aten = { config }: rec {
     environment = config.environment;
@@ -96,7 +96,7 @@ let
           yarnLock = "${info.src}/yarn.lock";
           pkgConfig = {
             node-sass = {
           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";
               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
                 ''
                 };
               in
                 ''
-                  export AR=${binutils.bintools}/bin/ar
                   node scripts/build.js --tarball=${nodeHeaders}
                 '';
             };
                   node scripts/build.js --tarball=${nodeHeaders}
                 '';
             };
index 8650ee310b860e9e28e5d6780b60b421c69aa771..ae2a3f609c179f587b3d57c8e942d4b2d9e461f3 100644 (file)
@@ -42,7 +42,7 @@ let
             buildInputs = with pkgs; [ nodePackages.node-pre-gyp ];
           };
           node-sass = {
             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";
             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
               ''
               };
             in
               ''
-                export AR=${pkgs.binutils.bintools}/bin/ar
                 node scripts/build.js --tarball=${nodeHeaders}
               '';
           };
                 node scripts/build.js --tarball=${nodeHeaders}
               '';
           };