X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix%2FNUR.git;a=blobdiff_plain;f=pkgs%2Fwebapps%2Fmastodon%2Fdefault.nix;h=ce015c5d7d4751d9525a1c152e6ab5d4278ff88b;hp=3769b67fd899891110910acfa87190413b659dd0;hb=84c6c827b76bd7296355fd5cc6c96eff25968f6e;hpb=b1566203381206632b4f00b7120c4484089ca924

diff --git a/pkgs/webapps/mastodon/default.nix b/pkgs/webapps/mastodon/default.nix
index 3769b67f..ce015c5d 100644
--- a/pkgs/webapps/mastodon/default.nix
+++ b/pkgs/webapps/mastodon/default.nix
@@ -1,15 +1,16 @@
 { varDir ? "/var/lib/mastodon", mylibs,
   stdenv, writeText, runCommand,
   ruby_2_6, bundlerEnv, defaultGemConfig,
-  jq, protobuf, protobufc, pkgconfig, libidn, pam, nodejs, yarn }:
+  jq, protobuf, protobufc, pkgconfig, libidn, pam, nodejs, yarn, yarn2nix-moretea }:
 let
   info = mylibs.fetchedGithub ./mastodon.json // {
-    src= runCommand "mastodon-patched" {
+    src = runCommand "mastodon-patched" {
       source = (mylibs.fetchedGithub ./mastodon.json).src;
     } ''
     cp -a $source $out
     chmod -R u+w $out
     sed -i -e "/fuubar/s/2.4.0/2.4.1/" $out/Gemfile.lock
+    sed -i -e "s/ff00dc470b5b2d9f145a6d6e977a54de5df2b4c9/ff00dc470b5b2d9f145a6d6e977a54de5df2b4c9#4255dc41fa7df9c3a02c1595f058e248bc37b784/" $out/yarn.lock
     '';
   };
   gems = bundlerEnv {
@@ -45,7 +46,7 @@ let
       cat ${info.src}/package.json | jq -r '.version = "${info.version}"' > $out
       '';
   in
-    mylibs.yarn2nixPackage.mkYarnModules rec {
+    yarn2nix-moretea.mkYarnModules rec {
       name = "mastodon-yarn";
       pname = name;
       version = info.version;
@@ -53,9 +54,6 @@ let
       yarnLock = "${info.src}/yarn.lock";
       yarnNix = ./yarn-packages.nix;
       pkgConfig = {
-        all = {
-          buildInputs = [ mylibs.yarn2nixPackage.src ];
-        };
         uws = {
           postInstall = ''
             npx node-gyp rebuild > build_log.txt 2>&1 || true