X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fmastodon%2Fmastodon.nix;h=bc4014d1bf5d432f532427862c697fadc962f344;hb=a4993193703e14c4af10dd0ea84829594a6ee30b;hpb=3345e58db4e8364a9561dc3d488da2438aca982a;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/mastodon/mastodon.nix b/nixops/modules/websites/tools/mastodon/mastodon.nix
index ef7ef57..bc4014d 100644
--- a/nixops/modules/websites/tools/mastodon/mastodon.nix
+++ b/nixops/modules/websites/tools/mastodon/mastodon.nix
@@ -4,7 +4,10 @@ let
   socketsDir = "/run/mastodon";
   gems = bundlerEnv {
     name = "mastodon-env";
-    ruby = ruby_2_5;
+    # https://git.immae.eu/mantisbt/view.php?id=131
+    ruby = ruby_2_5.overrideAttrs(old: {
+      postInstall = builtins.replaceStrings [" --destdir $GEM_HOME"] [""] old.postInstall;
+    });
     gemset = ./gemset.nix;
     gemdir = (fetchedGithub ./mastodon.json).src;
     groups = [ "default" "production" "test" "development" ];
@@ -31,22 +34,20 @@ let
         pkgConfig = {
           uws = {
             postInstall = ''
-              node-gyp rebuild > build_log.txt 2>&1 || true
+              npx node-gyp rebuild > build_log.txt 2>&1 || true
               '';
-            buildInputs = with pkgs; [ nodePackages.node-gyp ];
           };
           node-zopfli = {
             postInstall = ''
-              node-pre-gyp install --fallback-to-build
+              npx node-pre-gyp install --fallback-to-build
               '';
-            buildInputs = with pkgs; [ nodePackages.node-pre-gyp ];
           };
           node-sass = {
             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";
-                sha256 = "12zzsf8my43b8qnlacp871ih5vqafl2vlpqp51xp6h3gckn2frwy";
+                sha256 = "16f20ya3ys6w5w6y6l4536f7jrgk4gz46bf71w1r1xxb26a54m32";
               };
             in
               ''